commit cbda3cf9eea068c1a7cc10c41e55a89795c05fbe
author Harish Mahendrakar <harish.mahendrakar@ittiam.com> Fri Apr 24 04:55:37 2020 +0530
committer Ray Essick <essick@google.com> Fri Oct 30 02:26:50 2020 +0000
tree 507e59e4f0bb34bccbd89113f5576f26054ac0ad
parent 0edbb914880f3f8604f368ff2e8671a2e728e19e

C2SoftVorbisDec: Fix memory leaks in multiple headers case

Bug: 154302257
Test: atest android.mediav2.cts

Change-Id: I3fd89a3f504d29d2fdc2bfc9f6c73031765eb578
(cherry picked from commit a15aa8d1aa0b641d35245daa628cd7739f130c02)

media/codec2/components/vorbis/C2SoftVorbisDec.cpp

diff --git a/media/codec2/components/vorbis/C2SoftVorbisDec.cpp b/media/codec2/components/vorbis/C2SoftVorbisDec.cpp
index 15564d9..a8b5377 100644
--- a/media/codec2/components/vorbis/C2SoftVorbisDec.cpp
+++ b/media/codec2/components/vorbis/C2SoftVorbisDec.cpp
@@ -279,6 +279,8 @@
         // skip 7 <type + "vorbis"> bytes
         makeBitReader((const uint8_t *)data + 7, inSize - 7, &buf, &ref, &bits);
         if (data[0] == 1) {
+            // release any memory that vorbis_info_init will blindly overwrite
+            vorbis_info_clear(mVi);
             vorbis_info_init(mVi);
             if (0 != _vorbis_unpack_info(mVi, &bits)) {
                 ALOGE("Encountered error while unpacking info");
@@ -323,6 +325,8 @@
                 work->result = C2_CORRUPTED;
                 return;
             }
+            // release any memory that vorbis_dsp_init will blindly overwrite
+            vorbis_dsp_clear(mState);
             if (0 != vorbis_dsp_init(mState, mVi)) {
                 ALOGE("Encountered error while dsp init");
                 mSignalledError = true;