Commit c6ae3c5f authored Oct 05, 2021 by TreeHugger Robot Committed by Automerger Merge Worker Oct 05, 2021

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: ad42b268

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

Change-Id: Ifd75f99314f665d46c65ce4460179ca4b4ad47a0

media/codec2/components/mp3/C2SoftMp3Dec.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -413,7 +413,7 @@ void C2SoftMP3::process(
		mConfig->inputBufferCurrentLength = (inSize - inPos);
		mConfig->inputBufferMaxLength = 0;
		mConfig->inputBufferUsedLength = 0;
		mConfig->outputFrameSize = (calOutSize - outSize);
		mConfig->outputFrameSize = (calOutSize - outSize) / sizeof(int16_t);
		mConfig->pOutputBuffer = reinterpret_cast<int16_t *> (wView.data() + outSize);

		ERROR_CODE decoderErr;