commit fada886dea606f423f7f958b4716a74f26853323
author Marco Nelissen <marcone@google.com> Thu Oct 03 18:19:17 2019 -0700
committer android-build-merger <android-build-merger@google.com> Thu Oct 03 18:19:17 2019 -0700
tree aa37f703f758ec51d79b5c3e99568e1bc93572ba
parent f11fc2260594ef0b51abd5c483cae13df81fde20
parent 8f56bd1ef1be2156141aa6dbcbaf18751ad24bcb

Merge "Fix memory leak in MPEG2PSExtractor" am: 52a42dde36
am: 8f56bd1ef1

Change-Id: I2015e010bca7320d50f6d51ded4b33e9bac5beb5

media/extractors/mpeg2/MPEG2PSExtractor.cpp

diff --git a/media/extractors/mpeg2/MPEG2PSExtractor.cpp b/media/extractors/mpeg2/MPEG2PSExtractor.cpp
index 731584d..92ba039 100644
--- a/media/extractors/mpeg2/MPEG2PSExtractor.cpp
+++ b/media/extractors/mpeg2/MPEG2PSExtractor.cpp
@@ -111,8 +111,10 @@
     AMediaFormat *meta = AMediaFormat_new();
     for (size_t i = mTracks.size(); i > 0;) {
         i--;
-        if (mTracks.valueAt(i)->getFormat(meta) != AMEDIA_OK) {
+        Track *track = mTracks.valueAt(i);
+        if (track->getFormat(meta) != AMEDIA_OK) {
             mTracks.removeItemsAt(i);
+            delete track;
         }
     }
     AMediaFormat_delete(meta);
@@ -122,6 +124,10 @@
 
 MPEG2PSExtractor::~MPEG2PSExtractor() {
     delete mDataSource;
+    for (size_t i = mTracks.size(); i > 0;) {
+        i--;
+        delete mTracks.valueAt(i);
+    }
 }
 
 size_t MPEG2PSExtractor::countTracks() {
@@ -793,7 +799,9 @@
 }
 
 media_status_t MPEG2PSExtractor::WrappedTrack::start() {
+    delete mTrack->mBufferGroup;
     mTrack->mBufferGroup = mBufferGroup;
+    mBufferGroup = nullptr;
     return mTrack->start();
 }