commit 15f224469620ba4c588f553aed6acf32f09ab5d4
author Marco Nelissen <marcone@google.com> Tue May 16 15:49:58 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue May 16 15:49:58 2017 +0000
tree f605085634354905464493c031a4d8ad956fd47c
parent 8c805395e5d82efb12386a27988dfaab7f8af312
parent e4b59cb2560956a891453b71d4ef47020dca0c31

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

Change-Id: I89844419918d671a11696909cf530185ab452822

media/libstagefright/MPEG4Extractor.cpp

diff --git a/media/libstagefright/MPEG4Extractor.cpp b/media/libstagefright/MPEG4Extractor.cpp
index a5342f4..91e9660 100755
--- a/media/libstagefright/MPEG4Extractor.cpp
+++ b/media/libstagefright/MPEG4Extractor.cpp
@@ -1189,6 +1189,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);