summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2022-04-27 22:16:51 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2022-10-09 22:15:41 +0200
commit99f1f07b78c7a73f1e1eea5678b88c2b9d5bac3a (patch)
treee8a007cf9920c2c19b0b313c03be7f030b70c633
parent5deba24c221bc6c2222fd8a7007360ad40901a8f (diff)
downloadffmpeg-99f1f07b78c7a73f1e1eea5678b88c2b9d5bac3a.tar.gz
avcodec/h264dec: Skip late SEI
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> (cherry picked from commit f7dd408d64013ae177c1f8d0e04418e5075db5bc) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavcodec/h264dec.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/h264dec.c b/libavcodec/h264dec.c
index 0e189da61a..dc259ceff2 100644
--- a/libavcodec/h264dec.c
+++ b/libavcodec/h264dec.c
@@ -699,6 +699,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)