diff options
| author | Martin Storsjö <martin@martin.st> | 2013-09-16 16:17:05 +0300 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2013-09-17 15:57:27 +0300 |
| commit | 18a245a2aea31b92bc435f2962a71e060d83b5f7 (patch) | |
| tree | cb41fa8a7eac5a7774af46847da0ecd788d98f53 /libavcodec/jpeg2000dec.c | |
| parent | c38854c39929145bee07cee5377a7202df591e18 (diff) | |
jpeg2000dec: Add more checks when parsing headers
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'libavcodec/jpeg2000dec.c')
| -rw-r--r-- | libavcodec/jpeg2000dec.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index 61befdfae2..18346f9e59 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -1284,6 +1284,10 @@ static int jpeg2000_read_main_headers(Jpeg2000DecoderContext *s) av_log(s->avctx, AV_LOG_ERROR, "Missing SOT\n"); return AVERROR_INVALIDDATA; } + if (!s->tile) { + av_log(s->avctx, AV_LOG_ERROR, "Missing SIZ\n"); + return AVERROR_INVALIDDATA; + } tile = s->tile + s->curtileno; tp = tile->tile_part + tile->tp_idx; |