diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-21 04:40:50 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-23 01:02:03 +0200 |
| commit | 8bb11c3ca77b52e05a9ed1496a65f8a76e6e2d8f (patch) | |
| tree | e0dc3e6b6baace5a795c01f67b18d8f4d8d05dde /libavcodec | |
| parent | c443689afbb3edf3b025d4b7834c707d63eaa6b4 (diff) | |
| download | ffmpeg-8bb11c3ca77b52e05a9ed1496a65f8a76e6e2d8f.tar.gz | |
avcodec/jpeg2000dec: Check cdx/y values more carefully
Some invalid values where not handled correctly in the later pixel
format matching code.
Fixes out of array accesses
Fixes Ticket2848
Found-by: Piotr Bandurski <ami_stuff@o2.pl>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/jpeg2000dec.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index 3c14a13f8e..34ac536056 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -273,7 +273,8 @@ static int get_siz(Jpeg2000DecoderContext *s) s->sgnd[i] = !!(x & 0x80); s->cdx[i] = bytestream2_get_byteu(&s->g); s->cdy[i] = bytestream2_get_byteu(&s->g); - if (!s->cdx[i] || !s->cdy[i]) { + if ( !s->cdx[i] || s->cdx[i] == 3 || s->cdx[i] > 4 + || !s->cdy[i] || s->cdy[i] == 3 || s->cdy[i] > 4) { av_log(s->avctx, AV_LOG_ERROR, "Invalid sample seperation\n"); return AVERROR_INVALIDDATA; } |