diff options
author | Kamil Dudka <kdudka@redhat.com> | 2013-06-30 19:51:16 +0200 |
---|---|---|
committer | Kamil Dudka <kdudka@redhat.com> | 2013-06-30 20:13:14 +0200 |
commit | abca89aaa0fb208cfaf4ead6692014c4e553388a (patch) | |
tree | 1d612d70e0077d7b149e196ce185b173a74bb047 | |
parent | d689376cb0916cc9517c84f349eb321d424981e8 (diff) |
url: restore the functionality of 'curl -u :'
This commit fixes a regression introduced in
fddb7b44a79d78e05043e1c97e069308b6b85f79.
Reported by: Markus Moeller
Bug: http://curl.haxx.se/mail/archive-2013-06/0052.html
-rw-r--r-- | RELEASE-NOTES | 2 | ||||
-rw-r--r-- | lib/url.c | 7 |
2 files changed, 9 insertions, 0 deletions
diff --git a/RELEASE-NOTES b/RELEASE-NOTES index db9ef744a..db5323bb8 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -28,6 +28,7 @@ This release includes the following bugfixes: o c-ares: improve error message on failed resolve [4] o printf: make sure %x are treated unsigned o formpost: better random boundaries [5] + o url: restore the functionality of 'curl -u :' [6] This release includes the following known bugs: @@ -48,3 +49,4 @@ References to bug reports and discussions on issues: [3] = http://curl.haxx.se/bug/view.cgi?id=1249 [4] = http://curl.haxx.se/bug/view.cgi?id=1191 [5] = http://curl.haxx.se/bug/view.cgi?id=1251 + [6] = http://curl.haxx.se/mail/archive-2013-06/0052.html @@ -318,6 +318,13 @@ static CURLcode setstropt_userpwd(char *option, char **userp, char **passwdp, if(!result) { /* Store the username part of option if required */ if(userp) { + if(!user && option && option[0] == ':') { + /* Allocate an empty string instead of returning NULL as user name */ + user = strdup(""); + if(!user) + result = CURLE_OUT_OF_MEMORY; + } + Curl_safefree(*userp); *userp = user; } |