Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d2f920c8 authored by Wei Jia's avatar Wei Jia Committed by android-build-merger
Browse files

Merge "SoftVorbis: fail gracefully when hitting invalid parameter." into nyc-dev 

am: ca0cde25

* commit 'ca0cde25':
  SoftVorbis: fail gracefully when hitting invalid parameter.
parents 491c3314 ca0cde25

media/libstagefright/codecs/vorbis/dec/SoftVorbis.cpp

+7 −1
Original line number Diff line number Diff line
@@ -338,7 +338,13 @@ void SoftVorbis::onQueueFilled(OMX_U32 portIndex) { 
            }



            if (inHeader->nFilledLen || !mSawInputEos) {

                CHECK_GE(inHeader->nFilledLen, sizeof(numPageSamples));

                if (inHeader->nFilledLen < sizeof(numPageSamples)) {

                    notify(OMX_EventError, OMX_ErrorBadParameter, 0, NULL);

                    mSignalledError = true;

                    ALOGE("onQueueFilled, input header has nFilledLen %u, expected %zu",

                            inHeader->nFilledLen, sizeof(numPageSamples));

                    return;

                }

                memcpy(&numPageSamples,

                       inHeader->pBuffer

                        + inHeader->nOffset + inHeader->nFilledLen - 4,