generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

jpeg2000dec: check TPsot

Browse Source 
Fixes out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-05-22 02:31:03 +02:00
parent fec8783883
commit 73ffab4195
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/jpeg2000dec.c
View File

@ -432,6 +432,11 @@ static int get_sot(Jpeg2000DecoderContext *s, int n)
/* Read TNSot but not used */ /* Read TNSot but not used */
bytestream2_get_byteu(&s->g); // TNsot bytestream2_get_byteu(&s->g); // TNsot
if (TPsot >= FF_ARRAY_ELEMS(s->tile[s->curtileno].tile_part)) {
av_log(s->avctx, AV_LOG_ERROR, "TPsot %d too big\n", TPsot);
return AVERROR_PATCHWELCOME;
}
tp = s->tile[s->curtileno].tile_part + TPsot; tp = s->tile[s->curtileno].tile_part + TPsot;
tp->tile_index = Isot; tp->tile_index = Isot;
tp->tp_len = Psot; tp->tp_len = Psot;