commit 5a6520b002dfd771a3dacd82599baa787ed9c06f
author Marco Nelissen <marcone@google.com> Wed Oct 18 21:27:13 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Oct 18 21:27:13 2017 +0000
tree d91ae0b0093b03496c123ae0c55950b442f802cd
parent 4c1c9c8f5d09122aa97f8241a8d4da0834c0fac8
parent f777cb29a7e0bf5e2ee69a7d9680320382318d38

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
am: f777cb29a7

Change-Id: I7e600d301a194038596a5e08081b02dbed05db8d

media/libstagefright/MPEG4Extractor.cpp

diff --git a/media/libstagefright/MPEG4Extractor.cpp b/media/libstagefright/MPEG4Extractor.cpp
index a14d05e..3608bad 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;
         }
     }