Commit 698e042c authored by Michael Niedermayer's avatar Michael Niedermayer

avcodec/vp5: Check render_x/y

Fixes: Timeout (15sec -> 91ms)
Fixes: 18353/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_VP5_fuzzer-5704150326706176

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpegReviewed-by: 's avatarPeter Ross <pross@xvid.org>
Signed-off-by: 's avatarMichael Niedermayer <michael@niedermayer.cc>
parent 66589d9b
...@@ -48,6 +48,8 @@ static int vp5_parse_header(VP56Context *s, const uint8_t *buf, int buf_size) ...@@ -48,6 +48,8 @@ static int vp5_parse_header(VP56Context *s, const uint8_t *buf, int buf_size)
ff_vp56_init_dequant(s, vp56_rac_gets(c, 6)); ff_vp56_init_dequant(s, vp56_rac_gets(c, 6));
if (s->frames[VP56_FRAME_CURRENT]->key_frame) if (s->frames[VP56_FRAME_CURRENT]->key_frame)
{ {
int render_x, render_y;
vp56_rac_gets(c, 8); vp56_rac_gets(c, 8);
if(vp56_rac_gets(c, 5) > 5) if(vp56_rac_gets(c, 5) > 5)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
...@@ -63,8 +65,11 @@ static int vp5_parse_header(VP56Context *s, const uint8_t *buf, int buf_size) ...@@ -63,8 +65,11 @@ static int vp5_parse_header(VP56Context *s, const uint8_t *buf, int buf_size)
cols << 4, rows << 4); cols << 4, rows << 4);
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
vp56_rac_gets(c, 8); /* number of displayed macroblock rows */ render_y = vp56_rac_gets(c, 8); /* number of displayed macroblock rows */
vp56_rac_gets(c, 8); /* number of displayed macroblock cols */ render_x = vp56_rac_gets(c, 8); /* number of displayed macroblock cols */
if (render_x == 0 || render_x > cols ||
render_y == 0 || render_y > rows)
return AVERROR_INVALIDDATA;
vp56_rac_gets(c, 2); vp56_rac_gets(c, 2);
if (!s->macroblocks || /* first frame */ if (!s->macroblocks || /* first frame */
16*cols != s->avctx->coded_width || 16*cols != s->avctx->coded_width ||
......
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