diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-25 00:43:49 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-25 00:43:49 +0200 |
| commit | 9ff5e7974a8fe32c3b595a481c06a41fa316a9ac (patch) | |
| tree | 72d84b5465d2570bf7863e65df19a5b7b7ee765f /libavcodec | |
| parent | 67fc898243736d01ae03113ade4e8eace59ceb53 (diff) | |
| download | ffmpeg-9ff5e7974a8fe32c3b595a481c06a41fa316a9ac.tar.gz | |
avcodec/jpeg2000dec: Limit x/y step to 1<<30
Fixes infinite loop
Fixes Ticket4663
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/jpeg2000dec.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index 1901127634..3d518e3c4c 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -1075,9 +1075,8 @@ static int jpeg2000_decode_packets(Jpeg2000DecoderContext *s, Jpeg2000Tile *tile ok_reslevel = 1; for (reslevelno = 0; ok_reslevel; reslevelno++) { ok_reslevel = 0; - - step_x = 32; - step_y = 32; + step_x = 30; + step_y = 30; for (compno = 0; compno < s->ncomponents; compno++) { Jpeg2000Component *comp = tile->comp + compno; Jpeg2000CodingStyle *codsty = tile->codsty + compno; |