aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2016-11-15 18:05:33 +0100
committerMichael Niedermayer <michael@niedermayer.cc>2016-11-15 18:27:31 +0100
commit2baf36caed98cfdc7f6a2086fbf26f1a172f16cf (patch)
tree5fe2f0c9d8877ba6627d2b9108aba31d7c845312 /libavcodec
parent83a139e3d85a49abcca40385f263e021e5a0a6d8 (diff)
downloadffmpeg-2baf36caed98cfdc7f6a2086fbf26f1a172f16cf.tar.gz
avcodec/ituh263dec: Avoid spending a long time in slice sync
Fixes: 177/fuzz-3-ffmpeg_VIDEO_AV_CODEC_ID_FLV1_fuzzer Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/ituh263dec.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/ituh263dec.c b/libavcodec/ituh263dec.c
index a26244f393..5e3c0eac07 100644
--- a/libavcodec/ituh263dec.c
+++ b/libavcodec/ituh263dec.c
@@ -167,6 +167,7 @@ static int h263_decode_gob_header(MpegEncContext *s)
/* We have a GBSC probably with GSTUFF */
skip_bits(&s->gb, 16); /* Drop the zeros */
left= get_bits_left(&s->gb);
+ left = FFMIN(left, 32);
//MN: we must check the bits left or we might end in an infinite loop (or segfault)
for(;left>13; left--){
if(get_bits1(&s->gb)) break; /* Seek the '1' bit */