commit 3e913a793c09ebb20815f08e37aaf03864220429
author Marco Nelissen <marcone@google.com> Wed Sep 13 05:00:01 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Sep 13 05:00:01 2017 +0000
tree b0cf9da3b509a54cc6a4859156a13333219dde70
parent 35a587cdc548394a7fcb569815f9f4a65e5ff8a1
parent 12586d1c216c52efbfd2265d240147b1c31fe543

Merge "Fix memory leaks" into lmp-dev

media/libstagefright/MPEG4Extractor.cpp

diff --git a/media/libstagefright/MPEG4Extractor.cpp b/media/libstagefright/MPEG4Extractor.cpp
index 895433c..0dd909f 100644
--- a/media/libstagefright/MPEG4Extractor.cpp
+++ b/media/libstagefright/MPEG4Extractor.cpp
@@ -4014,6 +4014,8 @@
         }
         if (size > mBuffer->size()) {
             ALOGE("buffer too small: %zu > %zu", size, mBuffer->size());
+            mBuffer->release();
+            mBuffer = NULL;
             return ERROR_BUFFER_TOO_SMALL;
         }
     }
@@ -4300,6 +4302,8 @@
         }
         if (size > mBuffer->size()) {
             ALOGE("buffer too small: %zu > %zu", size, mBuffer->size());
+            mBuffer->release();
+            mBuffer = NULL;
             return ERROR_BUFFER_TOO_SMALL;
         }
     }