aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2018-07-03 21:37:46 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2018-07-08 19:45:47 +0200
commit4a42353c7a0c906a38c7cfc2fe29c0242a2c2231 (patch)
tree43389bc359d5167f5717c48d8b99fcd2492e3997
parent2b8c152327b9a403a648376e1fd3891fcc5fbb38 (diff)
downloadffmpeg-4a42353c7a0c906a38c7cfc2fe29c0242a2c2231.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>
-rw-r--r--libavformat/rmdec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/rmdec.c b/libavformat/rmdec.c
index 7656812eb1..59e27b026d 100644
--- a/libavformat/rmdec.c
+++ b/libavformat/rmdec.c
@@ -524,7 +524,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;
}