summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2022-08-15 00:02:37 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2022-10-09 22:15:44 +0200
commit4d537913e546d3db4db5ad7c0b93df091b2969af (patch)
tree3776cc774cb7724269d27de6db195913727e9998
parentec9af84dc5445d272092e91452fa67d796729e1f (diff)
downloadffmpeg-4d537913e546d3db4db5ad7c0b93df091b2969af.tar.gz
avcodec/h263dec: Sanity check against minimal I/P frame size
Fixes: Timeout Fixes: 49718/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_MPEG4_fuzzer-4874987894341632 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit ca4ff9c21cb77e024fa4ff5889826a8bee4d0e0a) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavcodec/h263dec.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c
index 2d136ff0db..edde8bef5c 100644
--- a/libavcodec/h263dec.c
+++ b/libavcodec/h263dec.c
@@ -544,6 +544,8 @@ retry:
avctx->has_b_frames = !s->low_delay;
if (CONFIG_MPEG4_DECODER && avctx->codec_id == AV_CODEC_ID_MPEG4) {
+ if (s->pict_type != AV_PICTURE_TYPE_B && s->mb_num/2 > get_bits_left(&s->gb))
+ return AVERROR_INVALIDDATA;
if (ff_mpeg4_workaround_bugs(avctx) == 1)
goto retry;
if (s->studio_profile != (s->idsp.idct == NULL))