mirror of
https://github.com/xenia-project/FFmpeg.git
synced 2024-12-03 09:01:00 +00:00
lavf/utils: Allow url credentials to contain a slash.
Fixes ticket #7816.
This commit is contained in:
parent
3bef1dab6e
commit
dd06f022b0
@ -4730,7 +4730,7 @@ void av_url_split(char *proto, int proto_size,
|
|||||||
char *hostname, int hostname_size,
|
char *hostname, int hostname_size,
|
||||||
int *port_ptr, char *path, int path_size, const char *url)
|
int *port_ptr, char *path, int path_size, const char *url)
|
||||||
{
|
{
|
||||||
const char *p, *ls, *ls2, *at, *at2, *col, *brk;
|
const char *p, *ls, *ls2, *ls3, *at, *at2, *col, *brk;
|
||||||
|
|
||||||
if (port_ptr)
|
if (port_ptr)
|
||||||
*port_ptr = -1;
|
*port_ptr = -1;
|
||||||
@ -4760,6 +4760,9 @@ void av_url_split(char *proto, int proto_size,
|
|||||||
/* separate path from hostname */
|
/* separate path from hostname */
|
||||||
ls = strchr(p, '/');
|
ls = strchr(p, '/');
|
||||||
ls2 = strchr(p, '?');
|
ls2 = strchr(p, '?');
|
||||||
|
ls3 = strchr(p, '@');
|
||||||
|
if (ls3 && ls3 > ls && (!ls2 || ls2 > ls3))
|
||||||
|
ls = strchr(ls3, '/');
|
||||||
if (!ls)
|
if (!ls)
|
||||||
ls = ls2;
|
ls = ls2;
|
||||||
else if (ls && ls2)
|
else if (ls && ls2)
|
||||||
|
Loading…
Reference in New Issue
Block a user