On Wed, Nov 04, 2020 at 01:06:46AM +0100, Michael Niedermayer wrote: > Fixes: NULL pointer dereference > Fixes: > 26814/clusterfuzz-testcase-minimized-ffmpeg_dem_ICO_fuzzer-5758487797432320 > > Found-by: continuous fuzzing process > https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg > Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc> > --- > libavformat/icodec.c | 7 +++++-- > 1 file changed, 5 insertions(+), 2 deletions(-) > > diff --git a/libavformat/icodec.c b/libavformat/icodec.c > index cf1e60815e..93179bb41e 100644 > --- a/libavformat/icodec.c > +++ b/libavformat/icodec.c > @@ -84,6 +84,9 @@ static int read_header(AVFormatContext *s) > avio_skip(pb, 4); > ico->nb_images = avio_rl16(pb); > > + if (!ico->nb_images) > + return AVERROR_INVALIDDATA; > + > ico->images = av_malloc_array(ico->nb_images, sizeof(IcoImage)); > if (!ico->images) > return AVERROR(ENOMEM); > @@ -93,7 +96,7 @@ static int read_header(AVFormatContext *s) > int tmp; > > if (avio_seek(pb, 6 + i * 16, SEEK_SET) < 0) > - break; > + goto fail; > > st = avformat_new_stream(s, NULL); > if (!st) { > @@ -118,7 +121,7 @@ static int read_header(AVFormatContext *s) > ico->images[i].offset = avio_rl32(pb); > > if (avio_seek(pb, ico->images[i].offset, SEEK_SET) < 0) > - break; > + goto fail; > > codec = avio_rl32(pb); > switch (codec) { > -- > 2.17.1
looks good -- Peter (A907 E02F A6E5 0CD2 34CD 20D2 6760 79C5 AC40 DD6B)
signature.asc
Description: PGP signature
_______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
