diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-20 12:03:32 +0300 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-20 12:03:32 +0300 |
commit | 4d50d53a6d604043b1020945f603a8adfc6a67cc (patch) | |
tree | 4c76be5d0ba5ab7d7a043fe7eb4228b6f32b033a /libavformat/mov.c | |
parent | 82d9c4e5789cefc35567e9e5e2c06c03a070f605 (diff) | |
parent | 9286de045968ad456d4e752651eec22de5e89060 (diff) |
Merge commit '9286de045968ad456d4e752651eec22de5e89060'
* commit '9286de045968ad456d4e752651eec22de5e89060':
mov: Double-check that alias path is not an absolute path
Conflicts:
libavformat/mov.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/mov.c')
-rw-r--r-- | libavformat/mov.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c index 4492e25656..7f4dd94f2e 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -2602,7 +2602,7 @@ static int mov_open_dref(AVIOContext **pb, const char *src, MOVDref *ref, { /* try relative path, we do not try the absolute because it can leak information about our system to an attacker */ - if (ref->nlvl_to > 0 && ref->nlvl_from > 0) { + if (ref->nlvl_to > 0 && ref->nlvl_from > 0 && ref->path[0] != '/') { char filename[1025]; const char *src_path; int i, l; |