From: Daniel Stenberg <daniel@haxx.se>
Date: Fri, 12 Nov 2021 12:34:49 +0000 (+0100)
Subject: Curl_connect_done: handle being called twice
X-Git-Tag: curl-7_81_0~179
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b89a4b5191e8471acca14d7de904213b0aa20125;p=thirdparty%2Fcurl.git

Curl_connect_done: handle being called twice

Follow-up to f0b7099a10d1a7c

When torture testing 1021, it turns out the Curl_connect_done function
might be called twice and that previously then wrongly cleared the HTTP
pointer in the second invoke.

Closes #7999
---

diff --git a/lib/http_proxy.c b/lib/http_proxy.c
index cfe616fa64..2555b401aa 100644
--- a/lib/http_proxy.c
+++ b/lib/http_proxy.c
@@ -207,8 +207,9 @@ void Curl_connect_done(struct Curl_easy *data)
     Curl_dyn_free(&s->rcvbuf);
     Curl_dyn_free(&s->req);
 
-    /* restore the protocol pointer */
-    data->req.p.http = s->prot_save;
+    /* restore the protocol pointer, if not already done */
+    if(s->prot_save)
+      data->req.p.http = s->prot_save;
     s->prot_save = NULL;
     data->info.httpcode = 0; /* clear it as it might've been used for the
                                 proxy */