fix crash issue of sliceskip and inf-loop in fmo

huili2 committed 11 years ago

Commit 928a7ea1 parent a5cabf05 files · +5 −28Browse 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+2−2

@@ -865,8 +865,8 @@ int32_t ParseSliceHeaderSyntaxs (PWelsDecoderContext pCtx, PBitStringAux pBs, co · 864 unmodified lines
865	WELS_READ_VERIFY (BsGetOneBit (pBs, &uiCode)); //slice_skip_flag	865	WELS_READ_VERIFY (BsGetOneBit (pBs, &uiCode)); //slice_skip_flag
866	pSliceHeadExt->bSliceSkipFlag = !!uiCode;	866	pSliceHeadExt->bSliceSkipFlag = !!uiCode;
867	if (pSliceHeadExt->bSliceSkipFlag) {	867	if (pSliceHeadExt->bSliceSkipFlag) {
868	WELS_READ_VERIFY (BsGetUe (pBs, &uiCode)); //num_mbs_in_slice_minus1	868	WelsLog (pLogCtx, WELS_LOG_WARNING, "bSliceSkipFlag == 1 not supported.");
869	pSliceHeadExt->uiNumMbsInSlice = 1 + uiCode;	869	return GENERATE_ERROR_NO (ERR_LEVEL_SLICE_HEADER, ERR_INFO_UNSUPPORTED_SLICESKIP);
870	} else {	870	} else {
871	WELS_READ_VERIFY (BsGetOneBit (pBs, &uiCode)); //adaptive_base_mode_flag	871	WELS_READ_VERIFY (BsGetOneBit (pBs, &uiCode)); //adaptive_base_mode_flag
872	pSliceHeadExt->bAdaptiveBaseModeFlag = !!uiCode;	872	pSliceHeadExt->bAdaptiveBaseModeFlag = !!uiCode;