From: Francesco Chemolli <kinkie@squid-cache.org>
Date: Mon, 28 Jan 2013 05:40:06 +0000 (-0700)
Subject: Fix error in config parser which would mis-assign the sslcrlfile directive.
X-Git-Tag: SQUID_3_2_7~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6f0d0342d87258b62fdfbf48a65caa9bc2c64293;p=thirdparty%2Fsquid.git

Fix error in config parser which would mis-assign the sslcrlfile directive.

Also, 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 4448215233..ed493154dd 100644
--- a/src/cache_cf.cc
+++ b/src/cache_cf.cc
@@ -2240,7 +2240,7 @@ parse_peer(peer ** 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);
@@ -4135,7 +4135,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]);
         }