commit 4bd7103388c9f76dccc78eb6a3120fa630a00250
author Marco Nelissen <marcone@google.com> Tue May 16 15:36:54 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue May 16 15:36:54 2017 +0000
tree cbdda12746bb58767e689926977a5142ea626ac6
parent 412be4b735610e6683e2db080ab2891b53b06510
parent a2fbd251ca74e2d7ac4f074116eda8a3fb381915

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

Change-Id: I8a0e99463feb24350f02d5b5ccdc9419ebb2d71d

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