commit 1182c9d9e5d82009ce293a17c11a06bb37b275cb
author Marco Nelissen <marcone@google.com> Tue May 16 16:10:00 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue May 16 16:10:00 2017 +0000
tree 30926382315bacd1143e4d95259ca21a2b5b999f
parent a6a7b14909af258203df20a53b3d1ef34b639633
parent cc8ee0ef477c7beb9d3563d94d04e5df8d290a86

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 am: 15f2244696 am: 6721b0295f am: 7c3b47540e am: 0967b342f4 am: b47837e3c6
am: cc8ee0ef47

Change-Id: I2ee55ff2503b9ac3428ddee8ea03f3c9c93ae4a2

media/libstagefright/MPEG4Extractor.cpp

diff --git a/media/libstagefright/MPEG4Extractor.cpp b/media/libstagefright/MPEG4Extractor.cpp
index f42fbcf..23b36d4 100644
--- a/media/libstagefright/MPEG4Extractor.cpp
+++ b/media/libstagefright/MPEG4Extractor.cpp
@@ -1233,6 +1233,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);