commit 546cc40a5a2fe8256d1930563314a4d66d0b9c6c
author Marco Nelissen <marcone@google.com> Wed Oct 18 20:34:05 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Oct 18 20:34:05 2017 +0000
tree 917184352b73ed97ac93e9434c3ff5445258cad7
parent d206dd91b091e12224454aeb6f0ba4db31e13065
parent 2e88fb1b7249c0378ead394a22cb9abeafe3a5c1

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

Change-Id: Ib945110140e94747c31d9763e61c30f259dd9d36

media/libstagefright/MPEG4Extractor.cpp

diff --git a/media/libstagefright/MPEG4Extractor.cpp b/media/libstagefright/MPEG4Extractor.cpp
index 1f59e3a..2037923 100644
--- a/media/libstagefright/MPEG4Extractor.cpp
+++ b/media/libstagefright/MPEG4Extractor.cpp
@@ -4487,6 +4487,8 @@
         }
         if (size > mBuffer->size()) {
             ALOGE("buffer too small: %zu > %zu", size, mBuffer->size());
+            mBuffer->release();
+            mBuffer = NULL;
             return ERROR_BUFFER_TOO_SMALL;
         }
     }
@@ -4779,6 +4781,8 @@
         }
         if (size > mBuffer->size()) {
             ALOGE("buffer too small: %zu > %zu", size, mBuffer->size());
+            mBuffer->release();
+            mBuffer = NULL;
             return ERROR_BUFFER_TOO_SMALL;
         }
     }