From: Daniel Stenberg <daniel@haxx.se>
Date: Thu, 9 Feb 2017 09:13:28 +0000 (+0100)
Subject: http_proxy: avoid freeing static memory
X-Git-Tag: curl-7_53_0~33
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e2e182227aa0e26baef9ead4e0b7459706e2ff28;p=curl

http_proxy: avoid freeing static memory

Follow up to 7fe81ec298e0: make sure 'host' is either NULL or malloced.
---

diff --git a/lib/http_proxy.c b/lib/http_proxy.c
index ac1b3bf93..d523ba519 100644
--- a/lib/http_proxy.c
+++ b/lib/http_proxy.c
@@ -5,7 +5,7 @@
  *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
- * Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al.
  *
  * This software is licensed as described in the file COPYING, which
  * you should have received as part of this distribution. The terms
@@ -199,7 +199,7 @@ CURLcode Curl_proxyCONNECT(struct connectdata *conn,
       free(host_port);
 
       if(!result) {
-        char *host=(char *)"";
+        char *host = NULL;
         const char *proxyconn="";
         const char *useragent="";
         const char *http = (conn->http_proxy.proxytype == CURLPROXY_HTTP_1_0) ?
@@ -242,7 +242,7 @@ CURLcode Curl_proxyCONNECT(struct connectdata *conn,
                            "%s", /* Proxy-Connection */
                            hostheader,
                            http,
-                           host,
+                           host?host:"",
                            conn->allocptr.proxyuserpwd?
                            conn->allocptr.proxyuserpwd:"",
                            useragent,