On Sun, Feb 09, 2020 at 01:55:00PM +0000, Andreas Rheinhardt wrote: > Michael Niedermayer: > > Fixes: Timeout (270sec -> 25ms) > > Fixes: > > 20485/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_AGM_fuzzer-5636954207289344 > > > > Found-by: continuous fuzzing process > > https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg > > Signed-off-by: Michael Niedermayer <[email protected]> > > --- > > libavcodec/agm.c | 3 +++ > > 1 file changed, 3 insertions(+) > > > > diff --git a/libavcodec/agm.c b/libavcodec/agm.c > > index 80f4697ee5..957131648b 100644 > > --- a/libavcodec/agm.c > > +++ b/libavcodec/agm.c > > @@ -573,6 +573,9 @@ static int decode_raw_intra_rgb(AVCodecContext *avctx, > > GetByteContext *gbyte, AV > > uint8_t *dst = frame->data[0] + (avctx->height - 1) * > > frame->linesize[0]; > > uint8_t r = 0, g = 0, b = 0; > > > > + if (bytestream2_get_bytes_left(gbyte) < 3 * avctx->width * > > avctx->height) > > Can the multiplication on the right overflow?
ff_set_dimensions() and others check for the dimensions not being too
large. So if they can overflow then there needs to be a bug elsewhere
>
> > + return AVERROR_INVALIDDATA;
> > +
> > for (int y = 0; y < avctx->height; y++) {
> > for (int x = 0; x < avctx->width; x++) {
> > dst[x*3+0] = bytestream2_get_byte(gbyte) + r;
>
> After one has checked once that enough data is present, one can use
> the unchecked bytestream2-API here and for the other two reads.
will do
thx
[...]
--
Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB
The smallest minority on earth is the individual. Those who deny
individual rights cannot claim to be defenders of minorities. - Ayn Rand
signature.asc
Description: PGP signature
_______________________________________________ ffmpeg-devel mailing list [email protected] https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email [email protected] with subject "unsubscribe".
