From: Daniel Stenberg <daniel@haxx.se>
Date: Thu, 2 Oct 2014 21:31:01 +0000 (+0200)
Subject: detect_proxy: fix possible single-byte memory leak
X-Git-Tag: curl-7_39_0~194
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b85c625d831de821d0e4ead3d01be2ffe955aa28;p=thirdparty%2Fcurl.git

detect_proxy: fix possible single-byte memory leak

Coverity CID 1202836. If the proxy environment variable returned an empty
string, it would be leaked. While an empty string is not really a proxy, other
logic in this function already allows a blank string to be returned so allow
that here to avoid the leak.
---

diff --git a/lib/url.c b/lib/url.c
index 69a75e3108..0ee6fb042b 100644
--- a/lib/url.c
+++ b/lib/url.c
@@ -4339,9 +4339,8 @@ static char *detect_proxy(struct connectdata *conn)
       prox=curl_getenv(proxy_env);
     }
 
-    if(prox && *prox) { /* don't count "" strings */
+    if(prox)
       proxy = prox; /* use this */
-    }
     else {
       proxy = curl_getenv("all_proxy"); /* default proxy to use */
       if(!proxy)