commit 2ebffcd4480126771dfa397a58ca98c6a5e06dea
author Harish Mahendrakar <harish.mahendrakar@ittiam.com> Mon Aug 06 14:01:55 2018 -0700
committer Ray Essick <essick@google.com> Mon Aug 06 16:04:31 2018 -0700
tree 0bf9d060be2fa9cea2d38c70ce80fd6bc30e769a
parent f1a2bfe74ceb88c0900b41c6053a8f86dbc86f2b

C2SoftXaacDec: Handle error cases when decoder fails to initialize

When decoder fails to initialize, it doesn't consume any bytes in
subsequent process call. Avoid this by returning an error when decoder
is not initialized before first process call.

Bug: 112194305
Test: cts-tradefed run commandAndExit cts-dev -m CtsSecurityTestCases\
 -t android.security.cts.StagefrightTest#testStagefright_c_2016_2428

Change-Id: I725c14a7634bab9355dbe743425919eea814f865

media/codecs/xaac/C2SoftXaacDec.cpp

diff --git a/media/codecs/xaac/C2SoftXaacDec.cpp b/media/codecs/xaac/C2SoftXaacDec.cpp
index 69b70cf..ba856d1 100644
--- a/media/codecs/xaac/C2SoftXaacDec.cpp
+++ b/media/codecs/xaac/C2SoftXaacDec.cpp
@@ -518,7 +518,6 @@
                 work->result = C2_CORRUPTED;
                 return;
             }
-            mIsCodecConfigFlushRequired = true;
 
             if ((mSampFreq != prevSampleRate) ||
                 (mNumChannels != prevNumChannels)) {
@@ -549,10 +548,14 @@
         signed int bytesConsumed = 0;
         IA_ERRORCODE errorCode = IA_NO_ERROR;
         if (mIsCodecInitialized) {
+            mIsCodecConfigFlushRequired = true;
             errorCode = decodeXAACStream(inBuffer, inBufferLength,
                                          &bytesConsumed, &mNumOutBytes);
-        } else {
+        } else if (!mIsCodecConfigFlushRequired) {
             ALOGW("Assumption that first frame after header initializes decoder Failed!");
+            mSignalledError = true;
+            work->result = C2_CORRUPTED;
+            return;
         }
         size -= bytesConsumed;
         offset += bytesConsumed;