From: Jaroslav Kysela <perex@perex.cz>
Date: Tue, 10 Jun 2014 18:14:43 +0000 (+0200)
Subject: httpc: add checking for NULL scheme and host
X-Git-Tag: v4.1~1941
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b22336f60c784e6b1813994f432797b365aadb17;p=thirdparty%2Ftvheadend.git

httpc: add checking for NULL scheme and host
---

diff --git a/src/httpc.c b/src/httpc.c
index 1e1f20600..7e2f188a5 100644
--- a/src/httpc.c
+++ b/src/httpc.c
@@ -1198,14 +1198,15 @@ http_client_reconnect
   free(hc->hc_scheme);
   free(hc->hc_host);
 
+  if (scheme == NULL || host == NULL)
+    return -EINVAL;
+
   port           = http_port(scheme, port);
   hc->hc_pevents = 0;
   hc->hc_version = ver;
   hc->hc_scheme  = strdup(scheme);
   hc->hc_host    = strdup(host);
   hc->hc_port    = port;
-  if (port < 0)
-    return -EINVAL;
   hc->hc_fd      = tcp_connect(host, port, hc->hc_bindaddr, errbuf, sizeof(errbuf), -1);
   if (hc->hc_fd < 0) {
     tvhlog(LOG_ERR, "httpc", "Unable to connect to %s:%i - %s", host, port, errbuf);