[FFmpeg-cvslog] avformat/siff: Reject audio packets without audio stream

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Tue Aug 11 14:41:13 2020 +0200| [8931c55789a69f717b4a6954c5bb7acf5475a134] | committer: Michael Niedermayer

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 at gmail.com>
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8931c55789a69f717b4a6954c5bb7acf5475a134
---

 libavformat/siff.c | 2 ++
 1 file changed, 2 insertions(+)

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);