| commit | 78374112727b158a9001f1dea07b866a50bab5da | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Mon Oct 05 23:01:03 2020 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Oct 05 23:01:03 2020 +0000 |
| tree | 94d10cc436903b2e359f41369875eb670b4e14be | |
| parent | 7d82e24ba2a0b301156e02deb02d35a0f8f5bdcb [diff] | |
| parent | 00952bddd8ea03cffed3a10d6a2194c592fca70a [diff] |
Merge "Fix memory leak and abort" into mainline-prod
diff --git a/media/extractors/mkv/MatroskaExtractor.cpp b/media/extractors/mkv/MatroskaExtractor.cpp index b88e4e8..27bd357 100644 --- a/media/extractors/mkv/MatroskaExtractor.cpp +++ b/media/extractors/mkv/MatroskaExtractor.cpp
@@ -840,7 +840,7 @@ } if (err != OK) { - mPendingFrames.clear(); + clearPendingFrames(); mBlockIter.advance(); mbuf->release();