From 484f8d77c6ecf995ac89d1071d3be0cae1f5326c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20B=C5=93sch?= Date: Sat, 16 Nov 2013 22:47:32 +0100 Subject: [PATCH] avcodec/vp9: assert on sane size in update_size(). w and h are both read as uint16 + 1 so this can not happen. A similar change was introduced in 97962b2 / 72ca830, with the av_log()+AVERROR_INVALIDDATA form, suggesting it could be triggerable somehow. Change suggested by Ronald S. Bultje. --- libavcodec/vp9.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/vp9.c b/libavcodec/vp9.c index 745bbd6218..785b18725c 100644 --- a/libavcodec/vp9.c +++ b/libavcodec/vp9.c @@ -243,6 +243,8 @@ static int update_size(AVCodecContext *ctx, int w, int h) VP9Context *s = ctx->priv_data; uint8_t *p; + av_assert0(w > 0 && h > 0); + if (s->above_partition_ctx && w == ctx->width && h == ctx->height) return 0;