ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Wed Jun 24 22:58:58 2015 +0200| [2d8bf3d126a3894cc77697e2d0359087c7036b4b] | committer: Michael Niedermayer
avcodec/jpeg2000dec: Check PPx / PPy values Signed-off-by: Michael Niedermayer <[email protected]> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2d8bf3d126a3894cc77697e2d0359087c7036b4b --- libavcodec/jpeg2000dec.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index fc5dc28..1901127 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -461,6 +461,13 @@ static int get_cox(Jpeg2000DecoderContext *s, Jpeg2000CodingStyle *c) byte = bytestream2_get_byte(&s->g); c->log2_prec_widths[i] = byte & 0x0F; // precinct PPx c->log2_prec_heights[i] = (byte >> 4) & 0x0F; // precinct PPy + if (i) + if (c->log2_prec_widths[i] == 0 || c->log2_prec_heights[i] == 0) { + av_log(s->avctx, AV_LOG_ERROR, "PPx %d PPy %d invalid\n", + c->log2_prec_widths[i], c->log2_prec_heights[i]); + c->log2_prec_widths[i] = c->log2_prec_heights[i] = 1; + return AVERROR_INVALIDDATA; + } } } else { memset(c->log2_prec_widths , 15, sizeof(c->log2_prec_widths )); _______________________________________________ ffmpeg-cvslog mailing list [email protected] http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
