commit 0ae16eb7796ae57c40a0004a81379cbd6734fc5a
author Marco Nelissen <marcone@google.com> Wed Sep 13 05:51:52 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Sep 13 05:51:52 2017 +0000
tree 121db404112287c652a9193b7651c3ebc484daeb
parent 27c4e661d45ea44d1e2feb6d02bb5f0ed842916e
parent 3e913a793c09ebb20815f08e37aaf03864220429

Merge "Fix memory leaks" into lmp-dev
am: 3e913a793c

Change-Id: I1daa8fed661c7d6fa7154fef9d183efdacaa63fb

media/libstagefright/MPEG4Extractor.cpp

diff --git a/media/libstagefright/MPEG4Extractor.cpp b/media/libstagefright/MPEG4Extractor.cpp
index 850ea15..78fdc70 100644
--- a/media/libstagefright/MPEG4Extractor.cpp
+++ b/media/libstagefright/MPEG4Extractor.cpp
@@ -3981,6 +3981,8 @@
         }
         if (size > mBuffer->size()) {
             ALOGE("buffer too small: %zu > %zu", size, mBuffer->size());
+            mBuffer->release();
+            mBuffer = NULL;
             return ERROR_BUFFER_TOO_SMALL;
         }
     }
@@ -4256,6 +4258,8 @@
         }
         if (size > mBuffer->size()) {
             ALOGE("buffer too small: %zu > %zu", size, mBuffer->size());
+            mBuffer->release();
+            mBuffer = NULL;
             return ERROR_BUFFER_TOO_SMALL;
         }
     }