diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-06-05 23:05:13 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-06-05 23:31:19 +0200 |
| commit | bbc19010edfdb1b2e248a24894c5ec77960bbfc3 (patch) | |
| tree | 8b7744f071415c4b62d0e9b44118ca4cdd017b2c | |
| parent | 702c1bf240f255d9afe2c3dbf2f07d7fbdc2ffc7 (diff) | |
| download | ffmpeg-bbc19010edfdb1b2e248a24894c5ec77960bbfc3.tar.gz | |
jpeg2000dec: return error for invalid cdxy values
Fixes division by 0
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/jpeg2000dec.c | 2 |
1 files changed, 2 insertions, 0 deletions
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; } } |