From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sat, 10 Jan 2009 15:37:49 +0000 (+1300)
Subject: Coverity scan found a few bad lines.
X-Git-Tag: SQUID_3_2_0_1~1272
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=71aab4cc91d750ff16d6a4293cc1cad4d5c4abb5;p=thirdparty%2Fsquid.git

Coverity scan found a few bad lines.
---

diff --git a/src/client_side.cc b/src/client_side.cc
index 6f5cc255f4..89583cb6b7 100644
--- a/src/client_side.cc
+++ b/src/client_side.cc
@@ -533,7 +533,8 @@ ClientHttpRequest::logRequest()
             checklist->reply = HTTPMSGLOCK(al.reply);
 
         if (!Config.accessList.log || checklist->fastCheck()) {
-            al.request = HTTPMSGLOCK(request);
+            if(request)
+                al.request = HTTPMSGLOCK(request);
             accessLogLog(&al, checklist);
             updateCounters();
 
diff --git a/src/ipcache.cc b/src/ipcache.cc
index f95c7f7b69..4a57e2ef91 100644
--- a/src/ipcache.cc
+++ b/src/ipcache.cc
@@ -855,11 +855,11 @@ static void
 ipcacheStatPrint(ipcache_entry * i, StoreEntry * sentry)
 {
     int k;
-    int count = i->addrs.count;
     char buf[MAX_IPSTRLEN];
 
     if (!sentry) {
         debugs(14, 0, HERE << "CRITICAL: sentry is NULL!");
+        return;
     }
 
     if (!i) {
@@ -868,6 +868,8 @@ ipcacheStatPrint(ipcache_entry * i, StoreEntry * sentry)
         return;
     }
 
+    int count = i->addrs.count;
+
     storeAppendPrintf(sentry, " %-32.32s %c%c %6d %6d %2d(%2d)",
                       hashKeyStr(&i->hash),
                       i->flags.fromhosts ? 'H' : ' ',
diff --git a/src/url.cc b/src/url.cc
index 9071695220..84bb42eabf 100644
--- a/src/url.cc
+++ b/src/url.cc
@@ -248,7 +248,7 @@ urlParse(const HttpRequestMethod& method, char *url, HttpRequest *request)
 
         /* Then everything until first /; thats host (and port; which we'll look for here later) */
         /* bug 1881: If we don't get a "/" then we imply it was there */
-        for (dst = host; i < l && *src != '/' && src != '\0'; i++, src++, dst++) {
+        for (dst = host; i < l && *src != '/' && *src != '\0'; i++, src++, dst++) {
             *dst = *src;
         }