Commit 8335ba8a authored by Michael Niedermayer's avatar Michael Niedermayer

avcodec/ituh263dec: Make the condition for the studio slice start code match...

avcodec/ituh263dec: Make the condition for the studio slice start code match between ff_h263_resync() and ff_mpeg4_decode_studio_slice_header()

If they mismatch an infinite loop can occur
Fixes: Timeout (infinite loop)
Fixes: 17043/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_MPEG4_fuzzer-5695051748868096

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpegSigned-off-by: 's avatarMichael Niedermayer <michael@niedermayer.cc>
parent fbb314b6
...@@ -222,7 +222,7 @@ int ff_h263_resync(MpegEncContext *s){ ...@@ -222,7 +222,7 @@ int ff_h263_resync(MpegEncContext *s){
get_bits(&s->gb, 8); get_bits(&s->gb, 8);
} }
if (show_bits_long(&s->gb, 32) == SLICE_START_CODE) if (get_bits_left(&s->gb) >= 32 && show_bits_long(&s->gb, 32) == SLICE_START_CODE)
return get_bits_count(&s->gb); return get_bits_count(&s->gb);
else else
return -1; return -1;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment