[FFmpeg-cvslog] avformat/rmdec: Better duplicate tags check
Michael Niedermayer
git at videolan.org
Fri Apr 8 01:31:54 EEST 2022
ffmpeg | branch: release/4.2 | Michael Niedermayer <michael at niedermayer.cc> | Thu Feb 24 00:26:08 2022 +0100| [27ed2b5bd83cce8f4e1215241f0f2f128201ceab] | committer: Michael Niedermayer
avformat/rmdec: Better duplicate tags check
Fixes: memleaks
Fixes: 44810/clusterfuzz-testcase-minimized-ffmpeg_dem_IVR_fuzzer-5619494647627776
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
(cherry picked from commit 15a646e5018078a0954918f510f819a5599f0445)
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=27ed2b5bd83cce8f4e1215241f0f2f128201ceab
---
libavformat/rmdec.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/libavformat/rmdec.c b/libavformat/rmdec.c
index a8360816b0..098e299e6c 100644
--- a/libavformat/rmdec.c
+++ b/libavformat/rmdec.c
@@ -127,10 +127,6 @@ 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) {
@@ -330,6 +326,11 @@ int ff_rm_read_mdpr_codecdata(AVFormatContext *s, AVIOContext *pb,
if (codec_data_size == 0)
return 0;
+ // Duplicate tags
+ if ( st->codecpar->codec_type != AVMEDIA_TYPE_UNKNOWN
+ && st->codecpar->codec_type != AVMEDIA_TYPE_DATA)
+ return AVERROR_INVALIDDATA;
+
avpriv_set_pts_info(st, 64, 1, 1000);
codec_pos = avio_tell(pb);
v = avio_rb32(pb);
More information about the ffmpeg-cvslog
mailing list