commit 8c96e87157e7b334be4532fa9f40e28b663db073
author Marco Nelissen <marcone@google.com> Thu Jun 01 23:27:07 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jun 01 23:27:07 2017 +0000
tree c8c6556bae99bc64029565da0aaed09646b00239
parent 9b2197958f08d7943bf8701588add13b65ce16de
parent 781d2a7521d15b4a4f1be40c2bdb3314769794e2

Merge "Fix potential leak" into mnc-dev am: 167af356fd am: 39336ac84e am: 1adfafdfdb
am: 781d2a7521

Change-Id: I3744292b358320f52342a3eb8550ea53afa4be5b

media/libstagefright/MPEG4Extractor.cpp

diff --git a/media/libstagefright/MPEG4Extractor.cpp b/media/libstagefright/MPEG4Extractor.cpp
index 00215c9..885f2cb 100644
--- a/media/libstagefright/MPEG4Extractor.cpp
+++ b/media/libstagefright/MPEG4Extractor.cpp
@@ -2739,8 +2739,10 @@
                     int32_t delay, padding;
                     if (sscanf(mLastCommentData,
                                " %*x %x %x %*x", &delay, &padding) == 2) {
-                        if (mLastTrack == NULL)
+                        if (mLastTrack == NULL) {
+                            delete[] buffer;
                             return ERROR_MALFORMED;
+                        }
 
                         mLastTrack->meta->setInt32(kKeyEncoderDelay, delay);
                         mLastTrack->meta->setInt32(kKeyEncoderPadding, padding);