diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-09-05 00:28:36 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-09-05 00:37:53 +0200 |
| commit | 9e704755515f504f4d454a1349a82885547d77ab (patch) | |
| tree | 50b41c9609a355c1dfab5552593da51de5251926 /libavcodec | |
| parent | 205c31b301864e675d051b07b19b6c457cf2ab24 (diff) | |
avcodec/jpeg2000dec: Assert that step_x/y are valid
Fixes CID1322304, CID1322305
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/jpeg2000dec.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index 66c5375f41..8a803e7022 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -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_y = FFMIN(step_y, rlevel->log2_prec_height + reducedresno); } + av_assert0(step_x < 32 && step_y < 32); step_x = 1<<step_x; step_y = 1<<step_y; |