On Fri, May 17, 2013 at 05:35:33PM +0200, Luca Barbato wrote: > They must be non-zero. > > Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind > CC: [email protected] > --- > libavcodec/mjpegdec.c | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c > index ef46c5f..83b40d9 100644 > --- a/libavcodec/mjpegdec.c > +++ b/libavcodec/mjpegdec.c > @@ -265,6 +265,13 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s) > s->quant_index[i] = get_bits(&s->gb, 8); > if (s->quant_index[i] >= 4) > return AVERROR_INVALIDDATA; > + if (!s->h_count[i] || !s->v_count[i]) { > + av_log(s->avctx, AV_LOG_ERROR, > + "Invalid sampling factor in component %d %d:%d\n", > + i, s->h_count[i], s->v_count[i]); > + return AVERROR_INVALIDDATA; > + } > + > av_log(s->avctx, AV_LOG_DEBUG, "component %d %d:%d id: %d > quant:%d\n", > i, s->h_count[i], s->v_count[i], > s->component_id[i], s->quant_index[i]); > --
LGTM _______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
