commit cc12f885a86a25fd28aa1bb449c6ea0d5cc60417
author Marco Nelissen <marcone@google.com> Thu Jun 01 23:59:05 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jun 01 23:59:05 2017 +0000
tree 8001983ab867df1f5431535ca8b5ab4f53c150fb
parent ea21ebc8b540fb108727f4fddfffe2923fdc416f
parent 60a160510c1cfef3958692b8ed0a83a87cfde4cd

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

Change-Id: I90f762013c9da6d0d991c44b90535ea5a3b8a1da

media/libstagefright/MPEG4Extractor.cpp

diff --git a/media/libstagefright/MPEG4Extractor.cpp b/media/libstagefright/MPEG4Extractor.cpp
index 0bb4dbb..bbdcf0b 100644
--- a/media/libstagefright/MPEG4Extractor.cpp
+++ b/media/libstagefright/MPEG4Extractor.cpp
@@ -2967,8 +2967,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);