diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-14 21:32:35 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-16 04:01:58 +0100 |
| commit | f6327e5fa618d4884a83aea5efb5e72b3bc1d371 (patch) | |
| tree | 98e30c39c4da975e1c546f6e753895da3b2357a9 | |
| parent | b80c486fb3b5d324a03a2e9fb532d639b2258e1f (diff) | |
| download | ffmpeg-f6327e5fa618d4884a83aea5efb5e72b3bc1d371.tar.gz | |
avformat/mov: Disallow ".." in dref unless use_absolute_path is set
as this kind of allows to circumvent it to some extend.
We also could add a separate parameter or value to choose this
Found-by: ramiro
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 1e4d0498df6621143da1a550006ddc3526ad51cb)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/mov.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c index 438cffbd34..de4004f3cc 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -2629,6 +2629,9 @@ static int mov_open_dref(AVIOContext **pb, const char *src, MOVDref *ref, av_strlcat(filename, "../", sizeof(filename)); av_strlcat(filename, ref->path + l + 1, sizeof(filename)); + if (!use_absolute_path) + if(strstr(ref->path + l + 1, "..") || ref->nlvl_from > 1) + return AVERROR(ENOENT); if (strlen(filename) + 1 == sizeof(filename)) return AVERROR(ENOENT); |