RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avformat/smjpegdec: Check the existence of referred streams 

Fixes: Assertion failure
Fixes: 23758/clusterfuzz-testcase-minimized-ffmpeg_DEMUXER_fuzzer-5160954605338624.fuzz

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 321ea59dac)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2020-07-06 20:18:42 +02:00
parent 7d3da77756
commit bcbfcf1300
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavformat/smjpegdec.c
View File

@ -51,6 +51,9 @@ static int smjpeg_read_header(AVFormatContext *s)
uint32_t version, htype, hlength, duration;
char *comment;
sc->audio_stream_index =
sc->video_stream_index = -1;
avio_skip(pb, 8); // magic
version = avio_rb32(pb);
if (version)
@ -147,6 +150,8 @@ static int smjpeg_read_packet(AVFormatContext *s, AVPacket *pkt)
dtype = avio_rl32(s->pb);
switch (dtype) {
case SMJPEG_SNDD:
if (sc->audio_stream_index < 0)
return AVERROR_INVALIDDATA;
timestamp = avio_rb32(s->pb);
size = avio_rb32(s->pb);
ret = av_get_packet(s->pb, pkt, size);
@ -155,6 +160,8 @@ static int smjpeg_read_packet(AVFormatContext *s, AVPacket *pkt)
pkt->pos = pos;
break;
case SMJPEG_VIDD:
if (sc->video_stream_index < 0)
return AVERROR_INVALIDDATA;
timestamp = avio_rb32(s->pb);
size = avio_rb32(s->pb);
ret = av_get_packet(s->pb, pkt, size);