RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-02-23 23:36:57 +00:00
Code Issues Projects Releases Wiki Activity

avformat/oggdec: Disable mid stream codec changes

Browse Source 
Fixes: 22082/clusterfuzz-testcase-minimized-ffmpeg_DEMUXER_fuzzer-5688619118624768
Fixes: crash from V-codecs/Theora/theora_testsuite_broken/multi2.ogg

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Suggested-by: Lynne on IRC
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 70277f1232)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2020-06-13 12:36:49 +02:00
parent c372189443
commit 6011484167
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavformat/oggdec.c
View File

@ -226,9 +226,10 @@ static int ogg_replace_stream(AVFormatContext *s, uint32_t serial, char *magic,
return AVERROR_INVALIDDATA;
}
/* We only have a single stream anyway, so if there's a new stream with
* a different codec just replace it */
os = &ogg->streams[0];
if (os->codec != codec)
return AVERROR(EINVAL);
os->serial = serial;
os->codec = codec;
os->serial = serial;