diff options
| author | Wei Jia <wjia@google.com> | 2015-07-20 11:34:22 -0700 |
|---|---|---|
| committer | Wei Jia <wjia@google.com> | 2015-08-14 18:05:07 -0700 |
| commit | 7913508110c80da87fb085514208adbd874d7d54 (patch) | |
| tree | 57c930606b3bbba8727a17270ad362b1e182ad86 /media/libstagefright/foundation | |
| parent | 3ce293842fed1b3abd2ff0aecd2a0c70a55086ee (diff) | |
| download | frameworks_av-7913508110c80da87fb085514208adbd874d7d54.zip frameworks_av-7913508110c80da87fb085514208adbd874d7d54.tar.gz frameworks_av-7913508110c80da87fb085514208adbd874d7d54.tar.bz2 | |
ABuffer: reset members when memory allocation fails.
Bug: 22077698
Change-Id: I2beb724662d041ad2339d0f4c7f983e7ac5e5e6f
(cherry picked from commit 94b0badc025b14141ff234e3e4e2745411742bac)
Diffstat (limited to 'media/libstagefright/foundation')
| -rw-r--r-- | media/libstagefright/foundation/ABuffer.cpp | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/media/libstagefright/foundation/ABuffer.cpp b/media/libstagefright/foundation/ABuffer.cpp index 6173db4..5f5c977 100644 --- a/media/libstagefright/foundation/ABuffer.cpp +++ b/media/libstagefright/foundation/ABuffer.cpp @@ -23,12 +23,17 @@ namespace android { ABuffer::ABuffer(size_t capacity) - : mData(malloc(capacity)), - mCapacity(capacity), - mRangeOffset(0), - mRangeLength(capacity), + : mRangeOffset(0), mInt32Data(0), mOwnsData(true) { + mData = malloc(capacity); + if (mData == NULL) { + mCapacity = 0; + mRangeLength = 0; + } else { + mCapacity = capacity; + mRangeLength = capacity; + } } ABuffer::ABuffer(void *data, size_t capacity) |