From bbc19010edfdb1b2e248a24894c5ec77960bbfc3 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Wed, 5 Jun 2013 23:05:13 +0200 Subject: [PATCH] jpeg2000dec: return error for invalid cdxy values Fixes division by 0 Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer --- libavcodec/jpeg2000dec.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index 921362fc12..e8e95a176e 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -194,6 +194,8 @@ static int get_siz(Jpeg2000DecoderContext *s) s->cdy[i] = bytestream2_get_byteu(&s->g); if (s->cdx[i] != 1 || s->cdy[i] != 1) { av_log(s->avctx, AV_LOG_ERROR, "unsupported/ CDxy values %d %d for component %d\n", s->cdx[i], s->cdy[i], i); + if (!s->cdx[i] || !s->cdy[i]) + return AVERROR_INVALIDDATA; } }