RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avformat/url: fix ff_make_absolute_url with Windows file paths 

Ugly, but a lot less broken than it was.

Fixes ticket #9166.

Signed-off-by: Marton Balint <cus@passwd.hu>
(cherry picked from commit 5dc5f289ce)
This commit is contained in:
Marton Balint 2021-04-02 17:07:54 +02:00
parent c64180fac8
commit d622923b36
1 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
libavformat/url.c
View File

@ -149,6 +149,18 @@ int ff_url_decompose(URLComponents *uc, const char *url, const char *end)
return 0; return 0;
} }
static int is_fq_dos_path(const char *path)
{
if ((path[0] >= 'a' && path[0] <= 'z' || path[0] >= 'A' && path[0] <= 'Z') &&
path[1] == ':' &&
(path[2] == '/' || path[2] == '\\'))
return 1;
if ((path[0] == '/' || path[0] == '\\') &&
(path[1] == '/' || path[1] == '\\'))
return 1;
return 0;
}
static int append_path(char *root, char *out_end, char **rout, static int append_path(char *root, char *out_end, char **rout,
const char *in, const char *in_end) const char *in, const char *in_end)
{ {
@ -185,6 +197,7 @@ int ff_make_absolute_url(char *buf, int size, const char *base,
char *out, *out_end, *path; char *out, *out_end, *path;
const char *keep, *base_path_end; const char *keep, *base_path_end;
int use_base_path, simplify_path = 0, ret; int use_base_path, simplify_path = 0, ret;
const char *base_separators = "/";
/* This is tricky. /* This is tricky.
For HTTP, http://server/site/page + ../media/file For HTTP, http://server/site/page + ../media/file
@ -211,6 +224,15 @@ int ff_make_absolute_url(char *buf, int size, const char *base,
if (!base) if (!base)
base = ""; base = "";
if (HAVE_DOS_PATHS) {
if ((ret = ff_url_decompose(&ub, base, NULL)) < 0)
goto error;
if (is_fq_dos_path(base) || av_strstart(base, "file:", NULL) || ub.path == ub.url) {
base_separators = "/\\";
if (is_fq_dos_path(rel))
base = "";
}
}
if ((ret = ff_url_decompose(&ub, base, NULL)) < 0 || if ((ret = ff_url_decompose(&ub, base, NULL)) < 0 ||
(ret = ff_url_decompose(&uc, rel, NULL)) < 0) (ret = ff_url_decompose(&uc, rel, NULL)) < 0)
goto error; goto error;
@ -249,7 +271,7 @@ int ff_make_absolute_url(char *buf, int size, const char *base,
if (use_base_path) { if (use_base_path) {
base_path_end = ub.url_component_end_path; base_path_end = ub.url_component_end_path;
if (URL_COMPONENT_HAVE(uc, path)) if (URL_COMPONENT_HAVE(uc, path))
while (base_path_end > ub.path && base_path_end[-1] != '/') while (base_path_end > ub.path && !strchr(base_separators, base_path_end[-1]))
base_path_end--; base_path_end--;
} }
if (keep > ub.path) if (keep > ub.path)