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

Commit 5cbaf65a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "C2SoftMp3Dec: fix OOB write in output buffer" into qt-dev am:... 

Merge "C2SoftMp3Dec: fix OOB write in output buffer" into qt-dev am: 1b210829 am: c63899df am: 62985ff9 am: 7102435d am: a473423c am: 089582db

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/15919336

Change-Id: I28fc0702e5beaa23c7e082c6b7b5bd679f680ed9
parents 70ddc96c 089582db

media/codec2/components/mp3/C2SoftMp3Dec.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -406,7 +406,7 @@ void C2SoftMP3::process( 
        mConfig->inputBufferCurrentLength = (inSize - inPos);

        mConfig->inputBufferCurrentLength = (inSize - inPos);

        mConfig->inputBufferMaxLength = 0;

        mConfig->inputBufferMaxLength = 0;

        mConfig->inputBufferUsedLength = 0;

        mConfig->inputBufferUsedLength = 0;

        mConfig->outputFrameSize = (calOutSize - outSize);

        mConfig->outputFrameSize = (calOutSize - outSize) / sizeof(int16_t);

        mConfig->pOutputBuffer = reinterpret_cast<int16_t *> (wView.data() + outSize);

        mConfig->pOutputBuffer = reinterpret_cast<int16_t *> (wView.data() + outSize);





        ERROR_CODE decoderErr;

        ERROR_CODE decoderErr;