diff mbox series

[FFmpeg-devel] avcodec/h264dec: Skip late SEI

Message ID 20220428182552.13104-1-michael@niedermayer.cc
State Accepted
Commit f7dd408d64013ae177c1f8d0e04418e5075db5bc
Headers show
Series [FFmpeg-devel] avcodec/h264dec: Skip late SEI | expand

Checks

Context Check Description
yinshiyou/make_loongarch64 success Make finished
yinshiyou/make_fate_loongarch64 success Make fate finished
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished
andriy/make_armv7_RPi4 success Make finished
andriy/make_fate_armv7_RPi4 success Make fate finished

Commit Message

Michael Niedermayer April 28, 2022, 6:25 p.m. UTC 
Fixes: Race condition
Fixes: clusterfuzz-testcase-minimized-mediasource_MP2T_AVC_pipeline_integration_fuzzer-6282675434094592

Found-by: google ClusterFuzz
Tested-by: Dan Sanders <sandersd@google.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 libavcodec/h264dec.c | 4 ++++
 1 file changed, 4 insertions(+)

Comments

Michael Niedermayer July 12, 2022, 6:25 p.m. UTC | #1 
On Thu, Apr 28, 2022 at 08:25:52PM +0200, Michael Niedermayer wrote:
> Fixes: Race condition
> Fixes: clusterfuzz-testcase-minimized-mediasource_MP2T_AVC_pipeline_integration_fuzzer-6282675434094592
> 
> Found-by: google ClusterFuzz
> Tested-by: Dan Sanders <sandersd@google.com>
> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> ---
>  libavcodec/h264dec.c | 4 ++++
>  1 file changed, 4 insertions(+)

will apply

[...]
diff mbox series

Patch

diff --git a/libavcodec/h264dec.c b/libavcodec/h264dec.c
index d80bc6b17f..2a5b53ea56 100644
--- a/libavcodec/h264dec.c
+++ b/libavcodec/h264dec.c
@@ -672,6 +672,10 @@  static int decode_nal_units(H264Context *h, const uint8_t *buf, int buf_size)
             avpriv_request_sample(avctx, "data partitioning");
             break;
         case H264_NAL_SEI:
+            if (h->setup_finished) {
+                avpriv_request_sample(avctx, "Late SEI");
+                break;
+            }
             ret = ff_h264_sei_decode(&h->sei, &nal->gb, &h->ps, avctx);
             h->has_recovery_point = h->has_recovery_point || h->sei.recovery_point.recovery_frame_cnt != -1;
             if (avctx->debug & FF_DEBUG_GREEN_MD)