summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClément Bœsch <u@pkh.me>2013-11-16 22:47:32 +0100
committerClément Bœsch <u@pkh.me>2013-11-16 22:47:54 +0100
commit484f8d77c6ecf995ac89d1071d3be0cae1f5326c (patch)
tree94f71bb07dc850e31cd4269b9123874c2fe00603
parentc20a7ce62d02d29e5222595c76b0a2563c9348b4 (diff)
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.
-rw-r--r--libavcodec/vp9.c2
1 files changed, 2 insertions, 0 deletions
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;