diff options
| author | Martin Storsjö <martin@martin.st> | 2010-06-19 21:56:50 +0000 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2010-06-19 21:56:50 +0000 |
| commit | a955fc5ee756b417eda0f1afbfaa69c4c6aafaa6 (patch) | |
| tree | 1ded26ee2c3fc621e0ce57d67297ea596f4223b8 | |
| parent | 6217b6451ad2e730d774d033ca7e77b59c3d66b3 (diff) | |
ff_url_join: Don't add any at-char if the auth is an empty string
Originally committed as revision 23650 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavformat/internal.h | 3 | ||||
| -rw-r--r-- | libavformat/utils.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/libavformat/internal.h b/libavformat/internal.h index 358959ce70..4489ffe9fe 100644 --- a/libavformat/internal.h +++ b/libavformat/internal.h @@ -131,7 +131,8 @@ void ff_url_split(char *proto, int proto_size, * @param size the size of the str buffer * @param proto the protocol identifier, if null, the separator * after the identifier is left out, too - * @param authorization an optional authorization string, may be null + * @param authorization an optional authorization string, may be null. + * An empty string is treated the same as a null string. * @param hostname the host name string * @param port the port number, left out from the string if negative * @param fmt a generic format string for everything to add after the diff --git a/libavformat/utils.c b/libavformat/utils.c index 9faa566a8c..59ca6bbde4 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -3601,7 +3601,7 @@ int ff_url_join(char *str, int size, const char *proto, str[0] = '\0'; if (proto) av_strlcatf(str, size, "%s://", proto); - if (authorization) + if (authorization && authorization[0]) av_strlcatf(str, size, "%s@", authorization); #if CONFIG_NETWORK && defined(AF_INET6) /* Determine if hostname is a numerical IPv6 address, |