generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '9286de045968ad456d4e752651eec22de5e89060'

Browse Source 
* commit '9286de045968ad456d4e752651eec22de5e89060':
  mov: Double-check that alias path is not an absolute path

Conflicts:
	libavformat/mov.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-04-20 11:03:32 +02:00
commit 4d50d53a6d
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/mov.c
View File

@ -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 /* try relative path, we do not try the absolute because it can leak information about our
system to an attacker */ 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]; char filename[1025];
const char *src_path; const char *src_path;
int i, l; int i, l;