From: Daniel Stenberg <daniel@haxx.se>
Date: Wed, 20 Jul 2022 21:24:17 +0000 (+0200)
Subject: url: enumerated type mixed with another type
X-Git-Tag: curl-7_85_0~133
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3be0c67379f024f90c7c27d9540d56f85657a806;p=thirdparty%2Fcurl.git

url: enumerated type mixed with another type

Follow-up to 1c58e7ae99ce2030213f28b

Closes #9179
---

diff --git a/lib/url.c b/lib/url.c
index 7e9924d259..426528fb5e 100644
--- a/lib/url.c
+++ b/lib/url.c
@@ -2735,16 +2735,16 @@ static CURLcode create_conn_helper_init_proxy(struct Curl_easy *data,
    * connection that may exist registered to the same proxy host.
    ***********************************************************************/
   if(proxy || socksproxy) {
+    curl_proxytype ptype = (curl_proxytype)conn->http_proxy.proxytype;
     if(proxy) {
-      result = parse_proxy(data, conn, proxy, conn->http_proxy.proxytype);
+      result = parse_proxy(data, conn, proxy, ptype);
       Curl_safefree(proxy); /* parse_proxy copies the proxy string */
       if(result)
         goto out;
     }
 
     if(socksproxy) {
-      result = parse_proxy(data, conn, socksproxy,
-                           conn->socks_proxy.proxytype);
+      result = parse_proxy(data, conn, socksproxy, ptype);
       /* parse_proxy copies the socks proxy string */
       Curl_safefree(socksproxy);
       if(result)