commit 545403e92b693a35015575896acf467f95f50373
author Ray Essick <essick@google.com> Tue Jun 26 11:57:05 2018 -0700
committer Ray Essick <essick@google.com> Fri Jun 29 09:28:41 2018 -0700
tree 2cd22381c1a91b7073654cf02e7de4013bb28011
parent 644c9d20cc6b0a08a104a3d56ac5dc1cf81b1b80

Clean Opus headers after parse failure

more robust behavior when opus headers are bad.
avoid unneeded CHECK() failures; recover allocations appropriately.

Bug: 110811823
Test: poc from bug
Change-Id: Ia8ccfa184ec7a1ab1d00e5ff197f7236b6bd491d

media/libstagefright/codecs/opus/dec/SoftOpus.cpp

diff --git a/media/libstagefright/codecs/opus/dec/SoftOpus.cpp b/media/libstagefright/codecs/opus/dec/SoftOpus.cpp
index 813004b..942f850 100644
--- a/media/libstagefright/codecs/opus/dec/SoftOpus.cpp
+++ b/media/libstagefright/codecs/opus/dec/SoftOpus.cpp
@@ -431,7 +431,7 @@
             }
 
             if (mInputBufferCount == 0) {
-                CHECK(mHeader == NULL);
+                delete mHeader;
                 mHeader = new OpusHeader();
                 memset(mHeader, 0, sizeof(*mHeader));
                 if (!ParseOpusHeader(data, size, mHeader)) {
@@ -452,6 +452,9 @@
                 }
 
                 int status = OPUS_INVALID_STATE;
+                if (mDecoder != NULL) {
+                    opus_multistream_decoder_destroy(mDecoder);
+                }
                 mDecoder = opus_multistream_decoder_create(kRate,
                                                            mHeader->channels,
                                                            mHeader->num_streams,