Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2022-08-15 01:02:37 +0300
committerMichael Niedermayer <michael@niedermayer.cc>2022-08-24 00:19:20 +0300
commitb2e0b0843f4760918d93d85bc0e17d1cd3b43287 (patch)
tree1a15d8d411a2876092fde07f8bbaeb6670218f3d
parent371fc3769bc633b978128e51a5953eea2276038b (diff)
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 7659697d17..b13892ddbb 100644
--- a/libavcodec/h263dec.c
+++ b/libavcodec/h263dec.c
@@ -532,6 +532,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;
}