catch urlParse failures

diff --git a/src/net_db.cc b/src/net_db.cc
index 9285076022afdebe17026d17020448446819f29a..9bec105704104ecee4c73bc230daa0e4b19a42b7 100644 (file)
--- 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 22df1fc64b4929ef651b5c71dcf29cb0d4bf4b48..45005a771439fa57edaf5b4fb19ffc8d7aca1ef9 100644 (file)
--- 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 */