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

avcodec/jpeg2000dec: Check tile offsets more completely 

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2017-05-28 13:52:13 +02:00
parent d8030c14bd
commit 9c1812491f
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/jpeg2000dec.c
View File

@ -300,7 +300,10 @@ static int get_siz(Jpeg2000DecoderContext *s)
if (s->tile_offset_x < 0 || s->tile_offset_y < 0 ||
s->image_offset_x < s->tile_offset_x ||
s->image_offset_y < s->tile_offset_y) {
s->image_offset_y < s->tile_offset_y ||
s->tile_width + (int64_t)s->tile_offset_x <= s->image_offset_x ||
s->tile_height + (int64_t)s->tile_offset_y <= s->image_offset_y
) {
av_log(s->avctx, AV_LOG_ERROR, "Tile offsets are invalid\n");
return AVERROR_INVALIDDATA;
}