RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

jpeg2000: Validate resolution levels 

There are 32 maximum decomposition levels, thus 33 resolution levels.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
This commit is contained in:
Luca Barbato 2013-07-01 10:00:58 +02:00
parent 8ad3267ce3
commit 5650e331a7
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/jpeg2000dec.c
View File

@ -251,7 +251,12 @@ static int get_cox(Jpeg2000DecoderContext *s, Jpeg2000CodingStyle *c)
if (s->buf_end - s->buf < 5) if (s->buf_end - s->buf < 5)
return AVERROR(EINVAL); return AVERROR(EINVAL);
c->nreslevels = bytestream_get_byte(&s->buf) + 1; // num of resolution levels - 1 /* nreslevels = number of resolution levels
= number of decomposition level +1 */
c->nreslevels = bytestream_get_byte(&s->buf) + 1;
if (c->nreslevels > JPEG2000_MAX_RESLEVELS)
return AVERROR_INVALIDDATA;
/* compute number of resolution levels to decode */ /* compute number of resolution levels to decode */
if (c->nreslevels < s->reduction_factor) if (c->nreslevels < s->reduction_factor)