From: wessels <>
Date: Wed, 6 May 1998 05:08:14 +0000 (+0000)
Subject: catch urlParse failures
X-Git-Tag: SQUID_3_0_PRE1~3380
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=50a97cee7959696fd7e9bb2bec8b9d8d4cb8f724;p=thirdparty%2Fsquid.git

catch urlParse failures
---

diff --git a/src/net_db.cc b/src/net_db.cc
index 9285076022..9bec105704 100644
--- a/src/net_db.cc
+++ b/src/net_db.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: net_db.cc,v 1.88 1998/05/05 18:52:59 wessels Exp $
+ * $Id: net_db.cc,v 1.89 1998/05/05 23:08:15 wessels Exp $
  *
  * DEBUG: section 37    Network Measurement Database
  * AUTHOR: Duane Wessels
@@ -926,7 +926,12 @@ netdbExchangeStart(void *data)
 	uri = internalRemoteUri(p->host, p->http_port, "/squid-internal-dynamic/", "netdb");
 	debug(0,0)("netdbExchangeStart: Requesting '%s'\n", uri);
 	assert(NULL != uri);
-	ex->r = requestLink(urlParse(METHOD_GET, uri));
+	ex->r = urlParse(METHOD_GET, uri);
+	if (NULL == ex->r) {
+	    debug(0,1)("netdbExchangeStart: Bad URI %s\n", uri);
+	    return;
+	}
+	requestLink(ex->r);
 	assert(NULL != ex->r);
 	ex->r->headers = xstrdup("\r\n");
 	ex->r->headers_sz = strlen(ex->r->headers);
diff --git a/src/peer_digest.cc b/src/peer_digest.cc
index 22df1fc64b..45005a7714 100644
--- a/src/peer_digest.cc
+++ b/src/peer_digest.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: peer_digest.cc,v 1.22 1998/05/05 23:01:25 wessels Exp $
+ * $Id: peer_digest.cc,v 1.23 1998/05/05 23:08:14 wessels Exp $
  *
  * DEBUG: section 72    Peer Digest Routines
  * AUTHOR: Alex Rousskov
@@ -239,7 +239,12 @@ peerDigestRequest(peer * p)
     url = internalRemoteUri(p->host, p->http_port, "/squid-internal-periodic/", StoreDigestUrlPath);
     key = storeKeyPublic(url, METHOD_GET);
     debug(72, 2) ("peerDigestRequest: %s key: %s\n", url, storeKeyText(key));
-    req = requestLink(urlParse(METHOD_GET, url));
+    req = urlParse(METHOD_GET, url);
+    if (NULL == req) {
+	debug(72,1)("peerDigestRequest: Bad URI: %s\n", url);
+	return;		/* @?@ */
+    }
+    requestLink(req);
     assert(req);
     /* add custom headers */
     /* rewrite this when requests get new header interface */