Browse Source

avcodec/webp: Update canvas size in vp8_lossy_decode_frame() as in vp8_lossless_decode_frame()

Fixes: 1407/clusterfuzz-testcase-minimized-6044604124102656
Fixes: 1420/clusterfuzz-testcase-minimized-6059927359455232

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 72810d20b7)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
tags/n3.1.8
Michael Niedermayer 8 years ago
parent
commit
4e5543571a
1 changed files with 3 additions and 0 deletions
  1. +3
    -0
      libavcodec/webp.c

+ 3
- 0
libavcodec/webp.c View File

@@ -1349,6 +1349,9 @@ static int vp8_lossy_decode_frame(AVCodecContext *avctx, AVFrame *p,
ret = ff_vp8_decode_frame(avctx, p, got_frame, &pkt);
if (ret < 0)
return ret;

update_canvas_size(avctx, avctx->width, avctx->height);

if (s->has_alpha) {
ret = vp8_lossy_decode_alpha(avctx, p, s->alpha_data,
s->alpha_data_size);


Loading…
Cancel
Save