aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2020-10-16 19:05:23 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2021-09-10 16:04:26 +0200
commitdb799e0bc2232f6b34c93b3d1edc7cd605236615 (patch)
tree4ae61e9da5c8a822229e4686b743b74059547b96
parent55698d3ef260e7a5241f10d9b0377396ae8d733f (diff)
downloadffmpeg-db799e0bc2232f6b34c93b3d1edc7cd605236615.tar.gz
avformat/icodec: Change order of operations to avoid NULL dereference
Fixes: SEGV on unknown address 0x000000000000 Fixes: 26379/clusterfuzz-testcase-minimized-ffmpeg_dem_ICO_fuzzer-5709011753893888 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Reviewed-by: Peter Ross Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 3300f5c133650ba25f94531d40ecc94c79b84457) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavformat/icodec.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/libavformat/icodec.c b/libavformat/icodec.c
index 98684e5e74..8340d09dec 100644
--- a/libavformat/icodec.c
+++ b/libavformat/icodec.c
@@ -156,12 +156,14 @@ static int read_packet(AVFormatContext *s, AVPacket *pkt)
IcoDemuxContext *ico = s->priv_data;
IcoImage *image;
AVIOContext *pb = s->pb;
- AVStream *st = s->streams[0];
+ AVStream *st;
int ret;
if (ico->current_image >= ico->nb_images)
return AVERROR_EOF;
+ st = s->streams[0];
+
image = &ico->images[ico->current_image];
if ((ret = avio_seek(pb, image->offset, SEEK_SET)) < 0)