From: Thomas Hozza <thozza@redhat.com>
Date: Tue, 25 Dec 2012 19:43:38 +0000 (+0100)
Subject: Import fixes for some defects found by Coverity Scan from Red Hat's patchset.
X-Git-Tag: SQUID_3_4_0_1~422
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2ae98e09b0c0948c40382dccd5ebe39abbce65a9;p=thirdparty%2Fsquid.git

Import fixes for some defects found by Coverity Scan from Red Hat's patchset.
---

diff --git a/src/HttpHdrRange.cc b/src/HttpHdrRange.cc
index f556d805a5..479e4f8e25 100644
--- a/src/HttpHdrRange.cc
+++ b/src/HttpHdrRange.cc
@@ -96,7 +96,7 @@ HttpHdrRangeSpec::parseInit(const char *field, int flen)
             return false;
     } else
         /* must have a '-' somewhere in _this_ field */
-        if (!((p = strchr(field, '-')) || (p - field >= flen))) {
+        if (!((p = strchr(field, '-')) && (p - field < flen))) {
             debugs(64, 2, "invalid (missing '-') range-spec near: '" << field << "'");
             return false;
         } else {
diff --git a/src/MemObject.cc b/src/MemObject.cc
index ecee3fdc76..59f8511822 100644
--- a/src/MemObject.cc
+++ b/src/MemObject.cc
@@ -182,7 +182,7 @@ MemObject::dump() const
     debugs(20, DBG_IMPORTANT, "MemObject->nclients: " << nclients);
     debugs(20, DBG_IMPORTANT, "MemObject->reply: " << _reply);
     debugs(20, DBG_IMPORTANT, "MemObject->request: " << request);
-    debugs(20, DBG_IMPORTANT, "MemObject->log_url: " << log_url << " " << checkNullString(log_url));
+    debugs(20, DBG_IMPORTANT, "MemObject->log_url: " << checkNullString(log_url));
 }
 
 HttpReply const *
diff --git a/src/client_side.cc b/src/client_side.cc
index 3b9531f521..54fcf1ab9d 100644
--- a/src/client_side.cc
+++ b/src/client_side.cc
@@ -714,7 +714,8 @@ ClientHttpRequest::logRequest()
         if (request)
             al->adapted_request = HTTPMSGLOCK(request);
         accessLogLog(al, checklist);
-        updateCounters();
+        if (request)
+            updateCounters();
 
         if (getConn() != NULL && getConn()->clientConnection != NULL)
             clientdbUpdate(getConn()->clientConnection->remote, logType, AnyP::PROTO_HTTP, out.size);