From: Francesco Chemolli <kinkie@squid-cache.org>
Date: Thu, 27 Dec 2012 18:15:38 +0000 (+0100)
Subject: Fix error in configuration parser which would misassigne the sslcrlfile directive.
X-Git-Tag: SQUID_3_4_0_1~414
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eaed60cccbb1969aac06978571d1f90d6f98032d;p=thirdparty%2Fsquid.git

Fix error in configuration parser which would misassigne the sslcrlfile directive.
Fix potentially crashing flaw in CPU affinity map display code.

Detected by Coverity Scan, defects 740336 and 740337.
---

diff --git a/src/cache_cf.cc b/src/cache_cf.cc
index 0464f7685c..ea918934f3 100644
--- a/src/cache_cf.cc
+++ b/src/cache_cf.cc
@@ -2281,7 +2281,7 @@ parse_peer(CachePeer ** head)
             p->sslcapath = xstrdup(token + 10);
         } else if (strncmp(token, "sslcrlfile=", 11) == 0) {
             safe_free(p->sslcrlfile);
-            p->sslcapath = xstrdup(token + 10);
+            p->sslcrlfile = xstrdup(token + 11);
         } else if (strncmp(token, "sslflags=", 9) == 0) {
             safe_free(p->sslflags);
             p->sslflags = xstrdup(token + 9);
@@ -4178,7 +4178,7 @@ dump_CpuAffinityMap(StoreEntry *const entry, const char *const name, const CpuAf
                               cpuAffinityMap->processes()[i]);
         }
         storeAppendPrintf(entry, " cores=");
-        for (size_t i = 0; i < cpuAffinityMap->processes().size(); ++i) {
+        for (size_t i = 0; i < cpuAffinityMap->cores().size(); ++i) {
             storeAppendPrintf(entry, "%s%i", (i ? "," : ""),
                               cpuAffinityMap->cores()[i]);
         }