commit 015ed4cd361b392b94c3b72e7de8ff85e0b2efea
author Marco Nelissen <marcone@google.com> Thu Jun 01 23:37:41 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jun 01 23:37:41 2017 +0000
tree 0af497ce66581fa04c4a218562ce2988a37a59dc
parent c50cf9d602d521b7194c359a0f85f8bb9bb5e5ad
parent 8c96e87157e7b334be4532fa9f40e28b663db073

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

Change-Id: I8e207b2ee20bbeacd4a91439ac098304d6ca6748

media/libstagefright/MPEG4Extractor.cpp

diff --git a/media/libstagefright/MPEG4Extractor.cpp b/media/libstagefright/MPEG4Extractor.cpp
index 9de92b5..fa062d8 100644
--- a/media/libstagefright/MPEG4Extractor.cpp
+++ b/media/libstagefright/MPEG4Extractor.cpp
@@ -2827,8 +2827,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);