har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avformat/url: check return value of strchr

Browse Source 
fix ticket: 8687
workflow should return if there have no value of strchr

Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
This commit is contained in:
Steven Liu 2020-05-28 10:41:25 +08:00
parent f66f3ca2c1
commit 029ff31af6
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavformat/url.c
View File

@ -90,6 +90,8 @@ static void trim_double_dot_url(char *buf, const char *rel, int size)
if (p && (sep = strstr(p, "://"))) { if (p && (sep = strstr(p, "://"))) {
sep += 3; sep += 3;
root = strchr(sep, '/'); root = strchr(sep, '/');
if (!root)
return;
} }
/* set new current position if the root node is changed */ /* set new current position if the root node is changed */
@ -150,6 +152,7 @@ void ff_make_absolute_url(char *buf, int size, const char *base,
} }
/* If rel actually is an absolute url, just copy it */ /* If rel actually is an absolute url, just copy it */
if (!base || strstr(rel, "://") || rel[0] == '/') { if (!base || strstr(rel, "://") || rel[0] == '/') {
memset(buf, 0, size);
trim_double_dot_url(buf, rel, size); trim_double_dot_url(buf, rel, size);
return; return;
} }
@ -177,6 +180,8 @@ void ff_make_absolute_url(char *buf, int size, const char *base,
if (sep) { if (sep) {
sep += 3; sep += 3;
root = strchr(sep, '/'); root = strchr(sep, '/');
if (!root)
return;
} }
} }