commit 781d2a7521d15b4a4f1be40c2bdb3314769794e2
author Marco Nelissen <marcone@google.com> Thu Jun 01 23:20:46 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jun 01 23:20:46 2017 +0000
tree a32ad4a6d67dbb2bb09fa3a8a48cf07d357125a6
parent 19b6a74a9de53d20e60de2855d49b654e0b8b2f9
parent 1adfafdfdb6570662ea78b98145dccbfcebeadb4

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

Change-Id: Ie4741f517a464ddb02cf6f1ccccc131cf3eafcfa

media/libstagefright/MPEG4Extractor.cpp

diff --git a/media/libstagefright/MPEG4Extractor.cpp b/media/libstagefright/MPEG4Extractor.cpp
index 91e9660..0996cdf 100755
--- a/media/libstagefright/MPEG4Extractor.cpp
+++ b/media/libstagefright/MPEG4Extractor.cpp
@@ -2638,8 +2638,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);