From f9505923a344a56c3ff36925adb7f0c3c9a3996c Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sat, 11 Aug 2012 02:00:33 +0200 Subject: [PATCH] cavsdec: check dimensions being valid. Fixes crash Fixes Ticket1628 Signed-off-by: Michael Niedermayer --- libavcodec/cavsdec.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavcodec/cavsdec.c b/libavcodec/cavsdec.c index 2131cd447f..099599ae51 100644 --- a/libavcodec/cavsdec.c +++ b/libavcodec/cavsdec.c @@ -625,6 +625,10 @@ static int decode_seq_header(AVSContext *h) { av_log_missing_feature(s, "Width/height changing in CAVS is", 0); return -1; } + if (width <= 0 || height <= 0) { + av_log(s, AV_LOG_ERROR, "Dimensions invalid\n"); + return AVERROR_INVALIDDATA; + } s->width = width; s->height = height; skip_bits(&s->gb,2); //chroma format