commit f777cb29a7e0bf5e2ee69a7d9680320382318d38
author Marco Nelissen <marcone@google.com> Wed Oct 18 20:51:55 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Oct 18 20:51:55 2017 +0000
tree 2724330e23f76d84e27d720bdb966c4485f5b853
parent b040d5f2e3b9fc2d4437125cd288fd78de983dd5
parent 546cc40a5a2fe8256d1930563314a4d66d0b9c6c

Merge "Fix memory leaks" into lmp-dev am: 3e913a793c am: 0ae16eb779 am: cf520f4f9e am: 22b4aa34ea am: a4856a624a am: 64fa39c01c am: ffb8750131 am: f2131eb33e am: da750ecced am: 2e88fb1b72
am: 546cc40a5a

Change-Id: I7e3c7cccf12aebd69e061604f605bda6d7364a9c

media/libstagefright/MPEG4Extractor.cpp

diff --git a/media/libstagefright/MPEG4Extractor.cpp b/media/libstagefright/MPEG4Extractor.cpp
index 1a1563a..9c096e6 100644
--- a/media/libstagefright/MPEG4Extractor.cpp
+++ b/media/libstagefright/MPEG4Extractor.cpp
@@ -4624,6 +4624,8 @@
         }
         if (size > mBuffer->size()) {
             ALOGE("buffer too small: %zu > %zu", size, mBuffer->size());
+            mBuffer->release();
+            mBuffer = NULL;
             return ERROR_BUFFER_TOO_SMALL;
         }
     }
@@ -4916,6 +4918,8 @@
         }
         if (size > mBuffer->size()) {
             ALOGE("buffer too small: %zu > %zu", size, mBuffer->size());
+            mBuffer->release();
+            mBuffer = NULL;
             return ERROR_BUFFER_TOO_SMALL;
         }
     }