mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-09-19 21:06:42 +00:00
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>
(cherry picked from commit 8931c55789
)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
parent
df401e11ed
commit
735255edb0
@ -200,6 +200,8 @@ static int siff_read_packet(AVFormatContext *s, AVPacket *pkt)
|
|||||||
if (c->curstrm == -1) {
|
if (c->curstrm == -1) {
|
||||||
c->pktsize = avio_rl32(s->pb) - 4;
|
c->pktsize = avio_rl32(s->pb) - 4;
|
||||||
c->flags = avio_rl16(s->pb);
|
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;
|
c->gmcsize = (c->flags & VB_HAS_GMC) ? 4 : 0;
|
||||||
if (c->gmcsize)
|
if (c->gmcsize)
|
||||||
avio_read(s->pb, c->gmc, c->gmcsize);
|
avio_read(s->pb, c->gmc, c->gmcsize);
|
||||||
|
Loading…
Reference in New Issue
Block a user