| commit | 55057ab40808d6c5a0b0c16d79c68330b06eafb9 | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Tue May 16 15:30:24 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue May 16 15:30:24 2017 +0000 |
| tree | 7c9285e1bc08dbc603eff8b432c952a93d23a94a | |
| parent | 086cee9d89db7f2367f7b403870f3a3324d32fe3 [diff] | |
| parent | 60657857c6249f617c26ac1c80b1f6c05fd0f59e [diff] |
Merge "Fix memory leak in error case" into klp-dev am: 5136b7436f am: 60657857c6 Change-Id: I1564d4e2626a31b7018bae301c50a268ccc79749
diff --git a/media/libstagefright/MPEG4Extractor.cpp b/media/libstagefright/MPEG4Extractor.cpp index 76fd136..bea7841 100644 --- a/media/libstagefright/MPEG4Extractor.cpp +++ b/media/libstagefright/MPEG4Extractor.cpp
@@ -1143,6 +1143,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);