fix oss-fuzzer reported bug 14060 by resetting decoder in time based on the error conditions.

xiaotiansf committed 7 years ago

Commit 7a1edba1 parent c210ef71 file · +3 −2Browse files

Showing the changes to codec/decoder/plus/src/welsDecoderExt.cpp (1 of 1 file). Show all

Unified · Split

codec/decoder/plus/src/welsDecoderExt.cpp+3−2

@@ -592,9 +592,10 @@ DECODING_STATE CWelsDecoder::DecodeFrame2 (const unsigned char* kpSrc, · 591 unmodified lines
592	592	}
593	593	return dsErrorFree;
594	594	}
595		− if ((m_pDecContext->iErrorCode == (dsBitstreamError \| dsDataErrorConcealed)) && m_pDecContext->eSliceType == B_SLICE) {
	595	+ if ((m_pDecContext->iErrorCode & (dsBitstreamError \| dsDataErrorConcealed)) && m_pDecContext->eSliceType == B_SLICE) {
596	596	if (ResetDecoder()) {
597		− return DECODING_STATE (dsBitstreamError \| dsDataErrorConcealed);
	597	+ pDstInfo->iBufferStatus = 0;
	598	+ return (DECODING_STATE)m_pDecContext->iErrorCode;
598	599	}
599	600	return dsErrorFree;
600	601	}