commit ae27f4385e45e453c87b9b2922d77d76c968cb25
author Harish Mahendrakar <harish.mahendrakar@ittiam.com> Mon Aug 06 14:01:55 2018 -0700
committer JP Sugarbroad <jpsugar@google.com> Tue Feb 12 13:15:00 2019 -0800
tree af7c5b6913705bf528e0b7ba3d102f4f940bba57
parent 66768403a6d1aadaa0a14cd607a42177c42c5467

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
(cherry picked from commit 2ebffcd4480126771dfa397a58ca98c6a5e06dea)

media/codecs/xaac/C2SoftXaacDec.cpp

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