Fix ossz-fuzz reported bug-13001. the fix has added one error code in codec_app_def.h which handles null ptrs in ref pic lists within refCount.

xiaotiansf committed 7 years ago

Commit 19a94861 parent 71d619c5 files · +33 −11Browse files

Showing the changes to codec/decoder/core/src/decoder_core.cpp (1 of 5 files). Show all

Unified · Split

codec/decoder/core/src/decoder_core.cpp+4−1

@@ -2720,7 +2720,10 @@ bool CheckAndFinishLastPic (PWelsDecoderContext pCtx, uint8_t** ppDst, SBufferIn · 2719 unmodified lines
2720	2720	DecodeFrameConstruction (pCtx, ppDst, pDstInfo);
2721	2721	pCtx->pPreviousDecodedPictureInDpb = pCtx->pDec; //save ECed pic for future use
2722	2722	if (pCtx->sLastNalHdrExt.sNalUnitHeader.uiNalRefIdc > 0) {
2723		− MarkECFrameAsRef (pCtx);
	2723	+ if (MarkECFrameAsRef (pCtx) == ERR_INFO_INVALID_PTR) {
	2724	+ pCtx->iErrorCode \|= dsRefListNullPtrs;
	2725	+ return false;
	2726	+ }
2724	2727	}
2725	2728	} else if (pCtx->pParam->bParseOnly) { //clear parse only internal data status
2726	2729	pCtx->pParserBsInfo->iNalNum = 0;