[FFmpeg-cvslog] avformat/icodec: Check for zero streams and stream creation failure
Michael Niedermayer
git at videolan.org
Fri Nov 13 19:11:05 EET 2020
ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Wed Nov 4 01:06:46 2020 +0100| [b33233bd53f74f94f4cd7be0645a99a9549a913e] | committer: Michael Niedermayer
avformat/icodec: Check for zero streams and stream creation failure
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
Reviewed-by: Peter Ross <pross at xvid.org>
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b33233bd53f74f94f4cd7be0645a99a9549a913e
---
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) {
More information about the ffmpeg-cvslog
mailing list