commit dd2f7e982fad787874ebefd07a2f4dc4771a9ba1
author Marco Nelissen <marcone@google.com> Tue May 16 15:39:56 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue May 16 15:39:56 2017 +0000
tree cbdda12746bb58767e689926977a5142ea626ac6
parent 045c64fe94e4efee969958262f3d58baf48b0e56
parent 4bd7103388c9f76dccc78eb6a3120fa630a00250

Merge "Fix memory leak in error case" into klp-dev am: 5136b7436f am: 60657857c6 am: 55057ab408 am: a2fbd251ca
am: 4bd7103388

Change-Id: I159ed2c6b4184689517bf39d791cb516d505e4ed

media/libstagefright/MPEG4Extractor.cpp

diff --git a/media/libstagefright/MPEG4Extractor.cpp b/media/libstagefright/MPEG4Extractor.cpp
index 707fdb0..313dbdf 100644
--- a/media/libstagefright/MPEG4Extractor.cpp
+++ b/media/libstagefright/MPEG4Extractor.cpp
@@ -1184,6 +1184,7 @@
             ALOGV("allocated pssh @ %p", pssh.data);
             ssize_t requested = (ssize_t) pssh.datalen;
             if (mDataSource->readAt(data_offset + 24, pssh.data, requested) < requested) {
+                delete[] pssh.data;
                 return ERROR_IO;
             }
             mPssh.push_back(pssh);