| Message ID | 20210929191629.9314-1-michael@niedermayer.cc |
|---|---|
| State | Accepted |
| Commit | 8fe3566b8fdf4bcf5eed419c1aab6eb848287ff3 |
| Headers | show |
| Series | [FFmpeg-devel,1/3] avformat/rmdec: Check for multiple audio_stream_info | expand |
| Context | Check | Description |
|---|---|---|
| andriy/make_x86 | success | Make finished |
| andriy/make_fate_x86 | success | Make fate finished |
| andriy/make_ppc | success | Make finished |
| andriy/make_fate_ppc | success | Make fate finished |
On Wed, Sep 29, 2021 at 09:16:27PM +0200, Michael Niedermayer wrote: > Fixes: memleak > Fixes: 39166/clusterfuzz-testcase-minimized-ffmpeg_dem_IVR_fuzzer-5153276690038784 > > Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg > Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> > --- > libavformat/rmdec.c | 4 ++++ > 1 file changed, 4 insertions(+) will apply [...]
diff --git a/libavformat/rmdec.c b/libavformat/rmdec.c index d4ba6622a67..3a3f6aaf094 100644 --- a/libavformat/rmdec.c +++ b/libavformat/rmdec.c @@ -127,6 +127,10 @@ static int rm_read_audio_stream_info(AVFormatContext *s, AVIOContext *pb, uint32_t version; int ret; + // Duplicate tags + if (st->codecpar->codec_type == AVMEDIA_TYPE_AUDIO) + return AVERROR_INVALIDDATA; + /* ra type header */ version = avio_rb16(pb); /* version */ if (version == 3) {
Fixes: memleak Fixes: 39166/clusterfuzz-testcase-minimized-ffmpeg_dem_IVR_fuzzer-5153276690038784 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> --- libavformat/rmdec.c | 4 ++++ 1 file changed, 4 insertions(+)