On Fri, May 17, 2013 at 04:20:34PM +0200, Luca Barbato wrote: > Prevent an out of array bound write. > > Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind > CC: [email protected] > --- > libavcodec/jpeglsdec.c | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/libavcodec/jpeglsdec.c b/libavcodec/jpeglsdec.c > index 3616063..df72ca3 100644 > --- a/libavcodec/jpeglsdec.c > +++ b/libavcodec/jpeglsdec.c > @@ -306,6 +306,10 @@ int ff_jpegls_decode_picture(MJpegDecodeContext *s, int > near, > av_dlog(s->avctx, "JPEG params: ILV=%i Pt=%i BPP=%i, scan = %i\n", > ilv, point_transform, s->bits, s->cur_scan); > if (ilv == 0) { /* separate planes */ > + if (s->cur_scan > s->nb_components) { > + ret = AVERROR_INVALIDDATA; > + goto end; > + } > off = s->cur_scan - 1; > stride = (s->nb_components > 1) ? 3 : 1; > width = s->width * stride; > --
LGTM _______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
