ffmpeg | branch: master | Michael Niedermayer <mich...@niedermayer.cc> | Sun Oct 11 14:52:39 2015 +0200| [c08b06c22579fa831dc547a16d2d39f0ab01f6d2] | committer: Michael Niedermayer
avcodec/jpeg2000dec: Check that step_x/y are valid before use in JPEG2000_PGOD_PCRL Fixes: CID1322305 and CID1322304 Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c08b06c22579fa831dc547a16d2d39f0ab01f6d2 --- libavcodec/jpeg2000dec.c | 4 ++++ 1 file changed, 4 insertions(+) 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; _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
