From: Daniel Stenberg <daniel@haxx.se>
Date: Thu, 13 Apr 2023 10:50:04 +0000 (+0200)
Subject: cf-h1-proxy: skip an extra NULL assign
X-Git-Tag: curl-8_1_0~152
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aabfa60371012efb39276c463db26016e89b5a10;p=thirdparty%2Fcurl.git

cf-h1-proxy: skip an extra NULL assign

and use Curl_safefree() once to save another NULL assign. Found by PVS.

Ref. #10929
Closes #10953
---

diff --git a/lib/cf-h1-proxy.c b/lib/cf-h1-proxy.c
index a02c46a526..700c199b1a 100644
--- a/lib/cf-h1-proxy.c
+++ b/lib/cf-h1-proxy.c
@@ -215,7 +215,6 @@ static void tunnel_go_state(struct Curl_cfilter *cf,
        make sure that it isn't accidentally used for the document request
        after we've connected. So let's free and clear it here. */
     Curl_safefree(data->state.aptr.proxyuserpwd);
-    data->state.aptr.proxyuserpwd = NULL;
 #ifdef USE_HYPER
     data->state.hconnect = FALSE;
 #endif
@@ -1043,8 +1042,7 @@ static CURLcode CONNECT(struct Curl_cfilter *cf,
   DEBUGASSERT(ts->tunnel_state == TUNNEL_RESPONSE);
   if(data->info.httpproxycode/100 != 2) {
     /* a non-2xx response and we have no next url to try. */
-    free(data->req.newurl);
-    data->req.newurl = NULL;
+    Curl_safefree(data->req.newurl);
     /* failure, close this connection to avoid re-use */
     streamclose(conn, "proxy CONNECT failure");
     tunnel_go_state(cf, ts, TUNNEL_FAILED, data);