virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

avcodec/jpeg2000dec: Assert that step_x/y are valid

Browse Source 
Fixes CID1322304, CID1322305

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2015-09-05 00:28:36 +02:00
parent 205c31b301
commit 9e70475551
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libavcodec/jpeg2000dec.c
View File

@ -1111,6 +1111,7 @@ static int jpeg2000_decode_packets_po_iteration(Jpeg2000DecoderContext *s, Jpeg2
step_x = FFMIN(step_x, rlevel->log2_prec_width + reducedresno); step_x = FFMIN(step_x, rlevel->log2_prec_width + reducedresno);
step_y = FFMIN(step_y, rlevel->log2_prec_height + reducedresno); step_y = FFMIN(step_y, rlevel->log2_prec_height + reducedresno);
} }
av_assert0(step_x < 32 && step_y < 32);
step_x = 1<<step_x; step_x = 1<<step_x;
step_y = 1<<step_y; step_y = 1<<step_y;