Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
F
ffmpeg
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
ffmpeg
Commits
77ccc914
Commit
77ccc914
authored
May 11, 2015
by
Michael Niedermayer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avformat/mov: Use open_cb() if set
Signed-off-by:
Michael Niedermayer
<
michaelni@gmx.at
>
parent
541d75f9
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
3 deletions
+11
-3
mov.c
libavformat/mov.c
+11
-3
No files found.
libavformat/mov.c
View file @
77ccc914
...
...
@@ -2602,6 +2602,11 @@ static void mov_build_index(MOVContext *mov, AVStream *st)
static
int
mov_open_dref
(
MOVContext
*
c
,
AVIOContext
**
pb
,
const
char
*
src
,
MOVDref
*
ref
,
AVIOInterruptCB
*
int_cb
)
{
AVOpenCallback
open_func
=
c
->
fc
->
open_cb
;
if
(
!
open_func
)
open_func
=
ffio_open2_wrapper
;
/* 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
&&
ref
->
path
[
0
]
!=
'/'
)
{
...
...
@@ -2634,19 +2639,22 @@ static int mov_open_dref(MOVContext *c, AVIOContext **pb, const char *src, MOVDr
av_strlcat
(
filename
,
"../"
,
sizeof
(
filename
));
av_strlcat
(
filename
,
ref
->
path
+
l
+
1
,
sizeof
(
filename
));
if
(
!
c
->
use_absolute_path
)
if
(
!
c
->
use_absolute_path
&&
!
c
->
fc
->
open_cb
)
if
(
strstr
(
ref
->
path
+
l
+
1
,
".."
)
||
ref
->
nlvl_from
>
1
)
return
AVERROR
(
ENOENT
);
if
(
strlen
(
filename
)
+
1
==
sizeof
(
filename
))
return
AVERROR
(
ENOENT
);
if
(
!
avio_open2
(
pb
,
filename
,
AVIO_FLAG_READ
,
int_cb
,
NULL
))
if
(
!
open_func
(
c
->
fc
,
pb
,
filename
,
AVIO_FLAG_READ
,
int_cb
,
NULL
))
return
0
;
}
}
else
if
(
c
->
use_absolute_path
)
{
av_log
(
c
->
fc
,
AV_LOG_WARNING
,
"Using absolute path on user request, "
"this is a possible security issue
\n
"
);
if
(
!
avio_open2
(
pb
,
ref
->
path
,
AVIO_FLAG_READ
,
int_cb
,
NULL
))
if
(
!
open_func
(
c
->
fc
,
pb
,
ref
->
path
,
AVIO_FLAG_READ
,
int_cb
,
NULL
))
return
0
;
}
else
if
(
c
->
fc
->
open_cb
)
{
if
(
!
open_func
(
c
->
fc
,
pb
,
ref
->
path
,
AVIO_FLAG_READ
,
int_cb
,
NULL
))
return
0
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment