commit 60a160510c1cfef3958692b8ed0a83a87cfde4cd
author Marco Nelissen <marcone@google.com> Thu Jun 01 23:51:30 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jun 01 23:51:30 2017 +0000
tree a19bd9010ec3076a3527d2534c6c0e6558e8996d
parent af8e0b2c1e116205e5abfc048fad438eb48352db
parent d2972602eeee54dc448cb8f25e9938b22cc88ece

Merge "Fix potential leak" into mnc-dev am: 167af356fd am: 39336ac84e am: 1adfafdfdb am: 781d2a7521 am: 8c96e87157 am: 015ed4cd36 am: 03c4e00bed
am: d2972602ee

Change-Id: I9cbf69f1fa4a7a1f916a1246bdea1361523a4d1b

media/libstagefright/MPEG4Extractor.cpp

diff --git a/media/libstagefright/MPEG4Extractor.cpp b/media/libstagefright/MPEG4Extractor.cpp
index 2d6e776..5441714 100644
--- a/media/libstagefright/MPEG4Extractor.cpp
+++ b/media/libstagefright/MPEG4Extractor.cpp
@@ -2826,8 +2826,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);