diff mbox

[FFmpeg-devel,3/3] avcodec/webp: Update canvas size in vp8_lossy_decode_frame() as in vp8_lossless_decode_frame()

Message ID 20170508124303.12267-3-michael@niedermayer.cc
State Accepted
Commit 72810d20b74f05cc4b214d6c277fa6f43160df54
Headers show

Commit Message

Michael Niedermayer May 8, 2017, 12:43 p.m. UTC 
Fixes: 1407/clusterfuzz-testcase-minimized-6044604124102656

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 libavcodec/webp.c | 3 +++
 1 file changed, 3 insertions(+)

Comments

Michael Niedermayer May 9, 2017, 3:27 p.m. UTC | #1 
On Mon, May 08, 2017 at 02:43:03PM +0200, Michael Niedermayer wrote:
> Fixes: 1407/clusterfuzz-testcase-minimized-6044604124102656
> 
> Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> ---
>  libavcodec/webp.c | 3 +++
>  1 file changed, 3 insertions(+)

patchset applied

[...]
Michael Niedermayer May 9, 2017, 3:35 p.m. UTC | #2 
On Mon, May 08, 2017 at 02:43:03PM +0200, Michael Niedermayer wrote:
> Fixes: 1407/clusterfuzz-testcase-minimized-6044604124102656

This also fixes 1420

[...]
diff mbox

Patch

diff --git a/libavcodec/webp.c b/libavcodec/webp.c
index 21e3bcfa0a..16c3ae2662 100644
--- a/libavcodec/webp.c
+++ b/libavcodec/webp.c
@@ -1351,6 +1351,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);