diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-26 02:19:13 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-26 02:19:13 +0200 |
| commit | 780669ef7c23c00836a24921fcc6b03be2b8ca4a (patch) | |
| tree | f439ab8f49b58498ba1cfbda60c09f20949ce01c | |
| parent | 3c9dd93faa9f3c250428dd0548c075583aa07cc3 (diff) | |
| download | ffmpeg-780669ef7c23c00836a24921fcc6b03be2b8ca4a.tar.gz | |
avcodec/jpeg2000dec: non zero image offsets are not supported
Fixes out of array accesses
Fixes Ticket3080
Found-by: ami_stuff
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/jpeg2000dec.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index 80bc335507..b150bc1595 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -243,6 +243,11 @@ static int get_siz(Jpeg2000DecoderContext *s) s->tile_offset_y = bytestream2_get_be32u(&s->g); // YT0Siz ncomponents = bytestream2_get_be16u(&s->g); // CSiz + if (s->image_offset_x || s->image_offset_y) { + avpriv_request_sample(s->avctx, "Support for image offsets"); + return AVERROR_PATCHWELCOME; + } + if (ncomponents <= 0) { av_log(s->avctx, AV_LOG_ERROR, "Invalid number of components: %d\n", s->ncomponents); |