shithub: openh264

Info  •  Files  •  Log  •  Branches

Merge pull request #3119 from xiaotiansf/LastFixes

fix oss-fuzzer reported bug 14060 by resetting decoder in time based …

--- a/codec/decoder/plus/src/welsDecoderExt.cpp

+++ b/codec/decoder/plus/src/welsDecoderExt.cpp

@@ -592,9 +592,10 @@

       }

       return dsErrorFree;

     }

-    if ((m_pDecContext->iErrorCode == (dsBitstreamError | dsDataErrorConcealed)) && m_pDecContext->eSliceType == B_SLICE) {

+    if ((m_pDecContext->iErrorCode & (dsBitstreamError | dsDataErrorConcealed)) && m_pDecContext->eSliceType == B_SLICE) {

       if (ResetDecoder()) {

-        return DECODING_STATE (dsBitstreamError | dsDataErrorConcealed);

+        pDstInfo->iBufferStatus = 0;

+        return (DECODING_STATE)m_pDecContext->iErrorCode;

       }

       return dsErrorFree;

     }