diff options
| author | Wei Jia <wjia@google.com> | 2015-08-17 19:18:24 -0700 |
|---|---|---|
| committer | Wei Jia <wjia@google.com> | 2015-08-17 19:18:24 -0700 |
| commit | dd7c0dd903ef6617d020c13f11b84996addff3c7 (patch) | |
| tree | 8e4a5c8a490a473f46d6c6451de3dbe030cd6e84 /media/libstagefright/foundation | |
| parent | 7d113a238871413e9bef15a2aa40731e56127a40 (diff) | |
| parent | 5a289b87952f1cafbdcf604ad5e6da20403b38d5 (diff) | |
| download | frameworks_av-dd7c0dd903ef6617d020c13f11b84996addff3c7.zip frameworks_av-dd7c0dd903ef6617d020c13f11b84996addff3c7.tar.gz frameworks_av-dd7c0dd903ef6617d020c13f11b84996addff3c7.tar.bz2 | |
Merge commit '5a289b87' into HEAD
ABuffer: reset members when memory allocation fails.
Bug: 22077698
(cherry picked from commit 94b0badc025b14141ff234e3e4e2745411742bac)
Change-Id: I359ec16e524ffb298c143c3d72fbf1a3af72d663
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) |