commit 00be42f32cc7f8f74135f3aefc5f393bcc8757dc
author Marco Nelissen <marcone@google.com> Tue May 16 15:42:58 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue May 16 15:42:58 2017 +0000
tree c4c63a3c406c10c92f790d3a4a3c1f710ca9f8f9
parent fd7cba4d0e5d828d42e81d373ec236f78f17fb00
parent dd2f7e982fad787874ebefd07a2f4dc4771a9ba1

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

Change-Id: I4cdcb7694baea6c10980860880c4bdcf41905a8f

media/libstagefright/MPEG4Extractor.cpp

diff --git a/media/libstagefright/MPEG4Extractor.cpp b/media/libstagefright/MPEG4Extractor.cpp
index 81ad3c9..fb1317c 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);