diff options
| author | Wei Jia <wjia@google.com> | 2015-08-18 13:11:37 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-18 13:11:37 +0000 |
| commit | ccc02053f07ea9c1d24678a2b191c5b6cef28094 (patch) | |
| tree | d29f1bb9a8cf8b3e310a69306bb258297812546c /media/libstagefright/foundation | |
| parent | 91860b89488b3ee4644c539e89e657fbb79fb6ad (diff) | |
| parent | ef2c6e044676bf9f0ead4359d7a1840236150e4d (diff) | |
| download | frameworks_av-ccc02053f07ea9c1d24678a2b191c5b6cef28094.zip frameworks_av-ccc02053f07ea9c1d24678a2b191c5b6cef28094.tar.gz frameworks_av-ccc02053f07ea9c1d24678a2b191c5b6cef28094.tar.bz2 | |
am ef2c6e04: am 45e493e4: Merge "Merge commit \'5a289b87\' into HEAD" into lmp-dev
* commit 'ef2c6e044676bf9f0ead4359d7a1840236150e4d':
ABuffer: reset members when memory allocation fails.
Diffstat (limited to 'media/libstagefright/foundation')
| -rw-r--r-- | media/libstagefright/foundation/ABuffer.cpp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/media/libstagefright/foundation/ABuffer.cpp b/media/libstagefright/foundation/ABuffer.cpp index b214870..4913fd4 100644 --- a/media/libstagefright/foundation/ABuffer.cpp +++ b/media/libstagefright/foundation/ABuffer.cpp @@ -25,12 +25,17 @@ namespace android { ABuffer::ABuffer(size_t capacity) : mMediaBufferBase(NULL), - mData(malloc(capacity)), - mCapacity(capacity), mRangeOffset(0), - mRangeLength(capacity), 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) |