commit dc46a84a00b86dca2d02fa84a53dddaaa7743753
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Oct 30 23:38:46 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Oct 30 23:38:46 2020 +0000
tree f82ee815ef1cf774a1a3433c173e33e4bb453b24
parent 71b5dbfd461e8d4371fd184e4e9dc1f67071f873
parent cbda3cf9eea068c1a7cc10c41e55a89795c05fbe

Merge "C2SoftVorbisDec: Fix memory leaks in multiple headers case" into mainline-prod

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;