summaryrefslogtreecommitdiff
path: root/libavformat/siff.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2020-08-11 14:41:13 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2020-08-20 13:27:22 +0200
commit8931c55789a69f717b4a6954c5bb7acf5475a134 (patch)
tree400c5684cc6e0606f909aa38a3f72d296fee323b /libavformat/siff.c
parent36f7b83568764ae73d0c7b3a43f1e3d3df234033 (diff)
avformat/siff: Reject audio packets without audio stream
Fixes: Assertion failure Fixes: 24612/clusterfuzz-testcase-minimized-ffmpeg_DEMUXER_fuzzer-6600899842277376.fuzz Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavformat/siff.c')
-rw-r--r--libavformat/siff.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/siff.c b/libavformat/siff.c
index f6815b2f26..60a867df14 100644
--- a/libavformat/siff.c
+++ b/libavformat/siff.c
@@ -201,6 +201,8 @@ static int siff_read_packet(AVFormatContext *s, AVPacket *pkt)
if (c->curstrm == -1) {
c->pktsize = avio_rl32(s->pb) - 4;
c->flags = avio_rl16(s->pb);
+ if (c->flags & VB_HAS_AUDIO && !c->has_audio)
+ return AVERROR_INVALIDDATA;
c->gmcsize = (c->flags & VB_HAS_GMC) ? 4 : 0;
if (c->gmcsize)
avio_read(s->pb, c->gmc, c->gmcsize);