commit 81f6c72f390c7a21e1d09470ef6168d36f3edf5a
author Dongwon Kang <dwkang@google.com> Thu Aug 03 21:59:29 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Aug 03 21:59:29 2017 +0000
tree 3accb662e8dddafa0db02c45f89f2578dec673be
parent 83f3c6406a3b89925cd4889697630e89a874aa19
parent d0538c82ea0d17d9eafdd6dcb1adfda945b97153

Merge "Fix memory leak in OggExtractor" into mnc-dev am: a7a43d9b56 am: 73c41f9d70 am: 20ff47b39c am: 8dd4d58d28 am: 7e9fe019ff am: 58db80184a am: 064c64340a am: 3996238b97 am: a164342ccc am: b579ff3a0e
am: d0538c82ea

Change-Id: I5c36b400f75ffe46d44b8c77991bd22c370f986b

media/libstagefright/OggExtractor.cpp

diff --git a/media/libstagefright/OggExtractor.cpp b/media/libstagefright/OggExtractor.cpp
index e31c37c..810b0d6 100644
--- a/media/libstagefright/OggExtractor.cpp
+++ b/media/libstagefright/OggExtractor.cpp
@@ -578,6 +578,10 @@
             }
             // First two pages are header pages.
             if (err == ERROR_END_OF_STREAM || mCurrentPage.mPageNo > 2) {
+                if (mBuf != NULL) {
+                    mBuf->release();
+                    mBuf = NULL;
+                }
                 break;
             }
             curGranulePosition = mCurrentPage.mGranulePosition;