virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-07-11 14:30:22 +02:00
Code Issues Releases Activity

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

Browse Source 
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>
This commit is contained in:
Michael Niedermayer
2017-05-08 14:43:03 +02:00
parent edf7bd14a8
commit 8198258d9e
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/webp.c
View File

@ -1350,6 +1350,9 @@ static int vp8_lossy_decode_frame(AVCodecContext *avctx, AVFrame *p,
ret = ff_vp8_decode_frame(avctx, p, got_frame, &pkt); ret = ff_vp8_decode_frame(avctx, p, got_frame, &pkt);
if (ret < 0) if (ret < 0)
return ret; return ret;
update_canvas_size(avctx, avctx->width, avctx->height);
if (s->has_alpha) { if (s->has_alpha) {
ret = vp8_lossy_decode_alpha(avctx, p, s->alpha_data, ret = vp8_lossy_decode_alpha(avctx, p, s->alpha_data,
s->alpha_data_size); s->alpha_data_size);