| commit | 60b65449e7494c27aea059908f547eff5817fdda | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Wed Aug 29 13:02:41 2018 -0700 |
| committer | Marco Nelissen <marcone@google.com> | Wed Aug 29 13:02:41 2018 -0700 |
| tree | 21cd958a8a13fcc841fcaf80712dcf8c694bdcf0 | |
| parent | 0d97cec0533f47237b16b294fd92a827f2ebdc6f [diff] |
Fix double free in MPEG4Extractor Bug: 113341381 Test: yes Change-Id: I6ae1cb03b04fa1d9b664a0ca8b29a21f60bd6bc3
diff --git a/media/extractors/mp4/MPEG4Extractor.cpp b/media/extractors/mp4/MPEG4Extractor.cpp index c02d2fb..f52d451 100644 --- a/media/extractors/mp4/MPEG4Extractor.cpp +++ b/media/extractors/mp4/MPEG4Extractor.cpp
@@ -393,7 +393,9 @@ } mPssh.clear(); - delete mCachedSource; + if (mCachedSource != mDataSource) { + delete mCachedSource; + } delete mDataSource; }