commit 19724bd388a11408faa523ce058d9207418cb0d8
author Marco Nelissen <marcone@google.com> Tue May 09 14:17:06 2017 -0700
committer android-build-team Robot <android-build-team-robot@google.com> Fri Jun 16 18:45:06 2017 +0000
tree 3ce0fed3c1ad35e6a0b42feaa7b7f0fae15719aa
parent 54a47d00b4b534fe8d2c9b50e9a952f11033d1f6

Fix potential leak

Fix potential memory leak introduced with bugfix for bug 31449945.

Bug: 36389123
Change-Id: I5a9a3551692d6cba385b45c4c7a465aa377a62b1
(cherry picked from commit a0721999eccd22d900eb6dec7e48f835f28ce999)

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);