RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-01-21 14:53:10 +00:00
Code Issues Projects Releases Wiki Activity

avcodec/jpeg2000dec: Limit x/y step to 1<<30

Browse Source 
Fixes infinite loop
Fixes Ticket4663

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-06-25 00:43:49 +02:00
parent 67fc898243
commit 9ff5e7974a
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/jpeg2000dec.c
View File

@ -1075,9 +1075,8 @@ static int jpeg2000_decode_packets(Jpeg2000DecoderContext *s, Jpeg2000Tile *tile
ok_reslevel = 1; ok_reslevel = 1;
for (reslevelno = 0; ok_reslevel; reslevelno++) { for (reslevelno = 0; ok_reslevel; reslevelno++) {
ok_reslevel = 0; ok_reslevel = 0;
step_x = 30;
step_x = 32; step_y = 30;
step_y = 32;
for (compno = 0; compno < s->ncomponents; compno++) { for (compno = 0; compno < s->ncomponents; compno++) {
Jpeg2000Component *comp = tile->comp + compno; Jpeg2000Component *comp = tile->comp + compno;
Jpeg2000CodingStyle *codsty = tile->codsty + compno; Jpeg2000CodingStyle *codsty = tile->codsty + compno;