avcodec/intrax8: Check for end of bitstream in ff_intrax8_decode_picture()

Fixes: Timeout (105sec -> 1sec)
Fixes: 20479/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_VC1_fuzzer-5769846937878528

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
pull/336/head
Michael Niedermayer 5 years ago
parent 0b11ad5172
commit 0a9ccc2514
  1. 2
      libavcodec/intrax8.c

@ -801,6 +801,8 @@ int ff_intrax8_decode_picture(IntraX8Context *w, Picture *pict,
for (w->mb_y = 0; w->mb_y < w->mb_height * 2; w->mb_y++) { for (w->mb_y = 0; w->mb_y < w->mb_height * 2; w->mb_y++) {
x8_init_block_index(w, w->frame); x8_init_block_index(w, w->frame);
mb_xy = (w->mb_y >> 1) * (w->mb_width + 1); mb_xy = (w->mb_y >> 1) * (w->mb_width + 1);
if (get_bits_left(gb) < 1)
goto error;
for (w->mb_x = 0; w->mb_x < w->mb_width * 2; w->mb_x++) { for (w->mb_x = 0; w->mb_x < w->mb_width * 2; w->mb_x++) {
x8_get_prediction(w); x8_get_prediction(w);
if (x8_setup_spatial_predictor(w, 0)) if (x8_setup_spatial_predictor(w, 0))

Loading…
Cancel
Save