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

Commit 406a06f8 authored by Wonsik Kim's avatar Wonsik Kim Committed by Android (Google) Code Review
Browse files

Merge "DO NOT MERGE codecs: check OMX buffer size before use in (gsm|g711)dec" into lmp-dev

parents ab727635 ecdd01b4

media/libstagefright/codecs/g711/dec/SoftG711.cpp

+9 −0
Original line number Diff line number Diff line
@@ -237,6 +237,15 @@ void SoftG711::onQueueFilled(OMX_U32 /* portIndex */) { 
            mSignalledError = true;

        }



        if (inHeader->nFilledLen * sizeof(int16_t) > outHeader->nAllocLen) {

            ALOGE("output buffer too small (%d).", outHeader->nAllocLen);

            android_errorWriteLog(0x534e4554, "27793163");



            notify(OMX_EventError, OMX_ErrorUndefined, 0, NULL);

            mSignalledError = true;

            return;

        }



        const uint8_t *inputptr = inHeader->pBuffer + inHeader->nOffset;



        if (mIsMLaw) {

media/libstagefright/codecs/gsm/dec/SoftGSM.cpp

+8 −0
Original line number Diff line number Diff line
@@ -225,6 +225,14 @@ void SoftGSM::onQueueFilled(OMX_U32 /* portIndex */) { 
            mSignalledError = true;

        }



        if (outHeader->nAllocLen < (inHeader->nFilledLen / 65) * 320) {

            ALOGE("output buffer is not large enough (%d).", outHeader->nAllocLen);

            android_errorWriteLog(0x534e4554, "27793367");

            notify(OMX_EventError, OMX_ErrorUndefined, 0, NULL);

            mSignalledError = true;

            return;

        }



        uint8_t *inputptr = inHeader->pBuffer + inHeader->nOffset;



        int n = mSignalledError ? 0 : DecodeGSM(mGsm,