diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2018-07-03 21:37:46 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2018-07-07 12:27:00 +0200 |
| commit | 09401d0a0abec4d1db395af3ddb2c610c5b51153 (patch) | |
| tree | e77be01783c16eaf2b5111668de96dbfaf1367be /libavformat | |
| parent | 9dea41eac7229688e566a4a3e3f8251acf7ab97c (diff) | |
| download | ffmpeg-09401d0a0abec4d1db395af3ddb2c610c5b51153.tar.gz | |
avformat/rmdec: Do not pass mime type in rm_read_multi() to ff_rm_read_mdpr_codecdata()
Fixes: use after free()
Fixes: rmdec-crash-ffe85b4cab1597d1cfea6955705e53f1f5c8a362
Found-by: Paul Ch <paulcher@icloud.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit a7e032a277452366771951e29fd0bf2bd5c029f0)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/rmdec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/rmdec.c b/libavformat/rmdec.c index d6d7d9cd84..3eb49a5d29 100644 --- a/libavformat/rmdec.c +++ b/libavformat/rmdec.c @@ -526,7 +526,7 @@ static int rm_read_multi(AVFormatContext *s, AVIOContext *pb, size2 = avio_rb32(pb); ret = ff_rm_read_mdpr_codecdata(s, s->pb, st2, st2->priv_data, - size2, mime); + size2, NULL); if (ret < 0) return ret; } |