From: Lyman Epp <lyman.epp@csgi.com>
Date: Tue, 12 Jun 2018 22:17:30 +0000 (-0500)
Subject: Curl_init_do: handle NULL connection pointer passed in
X-Git-Tag: curl-7_61_0~71
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a0f9670ec9caff9fcf4afe2e47904aa143d3b5aa;p=thirdparty%2Fcurl.git

Curl_init_do: handle NULL connection pointer passed in

Closes #2653
---

diff --git a/lib/url.c b/lib/url.c
index 817baaa080..d29eddaea7 100644
--- a/lib/url.c
+++ b/lib/url.c
@@ -4711,16 +4711,18 @@ CURLcode Curl_init_do(struct Curl_easy *data, struct connectdata *conn)
 {
   struct SingleRequest *k = &data->req;
 
-  conn->bits.do_more = FALSE; /* by default there's no curl_do_more() to
-                                 use */
+  if(conn) {
+    conn->bits.do_more = FALSE; /* by default there's no curl_do_more() to
+                                   use */
+    /* if the protocol used doesn't support wildcards, switch it off */
+    if(data->state.wildcardmatch &&
+       !(conn->handler->flags & PROTOPT_WILDCARD))
+      data->state.wildcardmatch = FALSE;
+  }
 
   data->state.done = FALSE; /* *_done() is not called yet */
   data->state.expect100header = FALSE;
 
-  /* if the protocol used doesn't support wildcards, switch it off */
-  if(data->state.wildcardmatch &&
-     !(conn->handler->flags & PROTOPT_WILDCARD))
-    data->state.wildcardmatch = FALSE;
 
   if(data->set.opt_no_body)
     /* in HTTP lingo, no body means using the HEAD request... */