diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-10-11 14:52:39 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-10-11 15:43:26 +0200 |
| commit | c08b06c22579fa831dc547a16d2d39f0ab01f6d2 (patch) | |
| tree | c96cd7fc798d7a35bffca83bfacded31251d026b /libavcodec/jpeg2000dec.c | |
| parent | 49f4967dd0b36e4c0db93eed45ddd6a32a813196 (diff) | |
| download | ffmpeg-streaming-c08b06c22579fa831dc547a16d2d39f0ab01f6d2.zip ffmpeg-streaming-c08b06c22579fa831dc547a16d2d39f0ab01f6d2.tar.gz | |
avcodec/jpeg2000dec: Check that step_x/y are valid before use in JPEG2000_PGOD_PCRL
Fixes: CID1322305 and CID1322304
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/jpeg2000dec.c')
| -rw-r--r-- | libavcodec/jpeg2000dec.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index f2441a9..fb811bb 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -1244,6 +1244,10 @@ static int jpeg2000_decode_packets_po_iteration(Jpeg2000DecoderContext *s, Jpeg2 step_y = FFMIN(step_y, rlevel->log2_prec_height + reducedresno); } } + if (step_x >= 31 || step_y >= 31){ + avpriv_request_sample(s->avctx, "PCRL with large step"); + return AVERROR_PATCHWELCOME; + } step_x = 1<<step_x; step_y = 1<<step_y; |
