]> git.ipfire.org Git - thirdparty/curl.git/commitdiff
http: add missing return code check
authorDaniel Stenberg <daniel@haxx.se>
Sat, 22 Sep 2018 20:32:47 +0000 (22:32 +0200)
committerDaniel Stenberg <daniel@haxx.se>
Sun, 23 Sep 2018 21:08:39 +0000 (23:08 +0200)
Detected by Coverity. CID 1439610.

Follow-up from 46e164069d1a523

Closes #3034

lib/http.c

index f6b24f0d560e4e0e53bb4b719e2b0fdc707db641..02ba13340f48558d59370ea811a6cd257ab5978b 100644 (file)
@@ -2453,8 +2453,6 @@ CURLcode Curl_http(struct connectdata *conn, bool *done)
   if(conn->bits.httpproxy && !conn->bits.tunnel_proxy) {
     char *url = data->change.url;
     result = Curl_add_buffer(&req_buffer, url, strlen(url));
-    if(result)
-      return result;
   }
   else if(paste_ftp_userpwd)
     result = Curl_add_bufferf(&req_buffer, "ftp://%s:%s@%s",
@@ -2464,12 +2462,11 @@ CURLcode Curl_http(struct connectdata *conn, bool *done)
     result = Curl_add_buffer(&req_buffer, path, strlen(path));
     if(result)
       return result;
-    if(query) {
+    if(query)
       result = Curl_add_bufferf(&req_buffer, "?%s", query);
-      if(result)
-        return result;
-    }
   }
+  if(result)
+    return result;
 
   result =
     Curl_add_bufferf(&req_buffer,