| commit | 9d9eab6d7cbd4a7ee459f93ad0149a63d2f15f6d | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Thu Oct 01 19:05:26 2020 -0700 |
| committer | android-build-team Robot <android-build-team-robot@google.com> | Thu Nov 12 18:33:28 2020 +0000 |
| tree | 56b6eca0b2b00a1083899f6238fb2499f5c4eec3 | |
| parent | 02a01d8c1227ebdea1356606a2aa8f5cac45c9bf [diff] |
Fix memory leak and abort Release all pending buffers in case of error, don't just clear buffers. Bug: 156819528 Test: fuzzer test case Change-Id: If925a3b54cacf6cb9ce0e2092866caa68cc4b456 (cherry picked from commit 7662ea5bad1c1385f024fd8ed980ae10f629ab96)
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();