diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-14 21:32:35 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-16 03:47:56 +0100 |
| commit | 1e4d0498df6621143da1a550006ddc3526ad51cb (patch) | |
| tree | 48dc1c418b29a5462df44f21d28cee8ae2819913 /libavformat/mov.c | |
| parent | e5755893786ecab2e6f0414d1b2983dcaa3d237e (diff) | |
| download | ffmpeg-1e4d0498df6621143da1a550006ddc3526ad51cb.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>
Diffstat (limited to 'libavformat/mov.c')
| -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); |