commit ccc02053f07ea9c1d24678a2b191c5b6cef28094
author Wei Jia <wjia@google.com> Tue Aug 18 13:11:37 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Aug 18 13:11:37 2015 +0000
tree d29f1bb9a8cf8b3e310a69306bb258297812546c
parent 91860b89488b3ee4644c539e89e657fbb79fb6ad
parent ef2c6e044676bf9f0ead4359d7a1840236150e4d

am ef2c6e04: am 45e493e4: Merge "Merge commit \'5a289b87\' into HEAD" into lmp-dev

* commit 'ef2c6e044676bf9f0ead4359d7a1840236150e4d':
  ABuffer: reset members when memory allocation fails.

media/libstagefright/foundation/ABuffer.cpp

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 @@
 
 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)