From: Diven Qi <diven.qi@zoom.us>
Date: Mon, 7 Sep 2020 09:30:04 +0000 (+0800)
Subject: url: use blank credentials when using proxy w/o username and password
X-Git-Tag: curl-7_73_0~126
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3532262edd13e191862b55dec546a732f7d79144;p=thirdparty%2Fcurl.git

url: use blank credentials when using proxy w/o username and password

Fixes proxy regression brought in commit ad829b21ae (7.71.0)

Fixed #5911
Closes #5914
---

diff --git a/lib/url.c b/lib/url.c
index b3884572d6..af2a1c06dd 100644
--- a/lib/url.c
+++ b/lib/url.c
@@ -2379,8 +2379,10 @@ static CURLcode parse_proxy(struct Curl_easy *data,
 static CURLcode parse_proxy_auth(struct Curl_easy *data,
                                  struct connectdata *conn)
 {
-  char *proxyuser = data->set.str[STRING_PROXYUSERNAME];
-  char *proxypasswd = data->set.str[STRING_PROXYPASSWORD];
+  const char *proxyuser = data->set.str[STRING_PROXYUSERNAME] ?
+    data->set.str[STRING_PROXYUSERNAME] : "";
+  const char *proxypasswd = data->set.str[STRING_PROXYPASSWORD] ?
+    data->set.str[STRING_PROXYPASSWORD] : "";
   CURLcode result = CURLE_OK;
 
   if(proxyuser)