highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avformat/mov: Pass MovContext into mov_open_dref()

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-05-11 17:28:25 +02:00
parent 94c20de429
commit 2b97cc2e5b
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libavformat/mov.c
View File

@ -2599,8 +2599,8 @@ static void mov_build_index(MOVContext *mov, AVStream *st)
} }
} }
static int mov_open_dref(AVIOContext **pb, const char *src, MOVDref *ref, static int mov_open_dref(MOVContext *c, AVIOContext **pb, const char *src, MOVDref *ref,
AVIOInterruptCB *int_cb, int use_absolute_path, AVFormatContext *fc) AVIOInterruptCB *int_cb)
{ {
/* 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 */
@ -2634,7 +2634,7 @@ static int mov_open_dref(AVIOContext **pb, const char *src, MOVDref *ref,
av_strlcat(filename, "../", sizeof(filename)); av_strlcat(filename, "../", sizeof(filename));
av_strlcat(filename, ref->path + l + 1, sizeof(filename)); av_strlcat(filename, ref->path + l + 1, sizeof(filename));
if (!use_absolute_path) if (!c->use_absolute_path)
if(strstr(ref->path + l + 1, "..") || ref->nlvl_from > 1) if(strstr(ref->path + l + 1, "..") || ref->nlvl_from > 1)
return AVERROR(ENOENT); return AVERROR(ENOENT);
@ -2643,8 +2643,8 @@ static int mov_open_dref(AVIOContext **pb, const char *src, MOVDref *ref,
if (!avio_open2(pb, filename, AVIO_FLAG_READ, int_cb, NULL)) if (!avio_open2(pb, filename, AVIO_FLAG_READ, int_cb, NULL))
return 0; return 0;
} }
} else if (use_absolute_path) { } else if (c->use_absolute_path) {
av_log(fc, AV_LOG_WARNING, "Using absolute path on user request, " av_log(c->fc, AV_LOG_WARNING, "Using absolute path on user request, "
"this is a possible security issue\n"); "this is a possible security issue\n");
if (!avio_open2(pb, ref->path, AVIO_FLAG_READ, int_cb, NULL)) if (!avio_open2(pb, ref->path, AVIO_FLAG_READ, int_cb, NULL))
return 0; return 0;
@ -2698,8 +2698,8 @@ static int mov_read_trak(MOVContext *c, AVIOContext *pb, MOVAtom atom)
if (sc->dref_id-1 < sc->drefs_count && sc->drefs[sc->dref_id-1].path) { if (sc->dref_id-1 < sc->drefs_count && sc->drefs[sc->dref_id-1].path) {
MOVDref *dref = &sc->drefs[sc->dref_id - 1]; MOVDref *dref = &sc->drefs[sc->dref_id - 1];
if (mov_open_dref(&sc->pb, c->fc->filename, dref, &c->fc->interrupt_callback, if (mov_open_dref(c, &sc->pb, c->fc->filename, dref,
c->use_absolute_path, c->fc) < 0) &c->fc->interrupt_callback) < 0)
av_log(c->fc, AV_LOG_ERROR, av_log(c->fc, AV_LOG_ERROR,
"stream %d, error opening alias: path='%s', dir='%s', " "stream %d, error opening alias: path='%s', dir='%s', "
"filename='%s', volume='%s', nlvl_from=%d, nlvl_to=%d\n", "filename='%s', volume='%s', nlvl_from=%d, nlvl_to=%d\n",