------------------------------------------------------------
revno: 12442
revision-id: squid3@treenet.co.nz-20130102095944-qml95vbr8ryeoa0o
parent: squidadm@squid-cache.org-20130102060736-0a7sra9dj11ftwkr
author: Francesco Chemolli <kinkie@squid-cache.org>
committer: Amos Jeffries <squid3@treenet.co.nz>
branch nick: 3.3
timestamp: Wed 2013-01-02 02:59:44 -0700
message:
  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.
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@treenet.co.nz-20130102095944-qml95vbr8ryeoa0o
# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.3
# testament_sha1: 9c3802e6298eaa4b761246b9fb888650f7eca7e7
# timestamp: 2013-01-02 10:14:45 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.3
# base_revision_id: squidadm@squid-cache.org-20130102060736-\
#   0a7sra9dj11ftwkr
# 
# Begin patch
=== modified file 'src/cache_cf.cc'
--- src/cache_cf.cc	2012-11-24 03:40:43 +0000
+++ src/cache_cf.cc	2013-01-02 09:59:44 +0000
@@ -2282,7 +2282,7 @@
             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);
@@ -4179,7 +4179,7 @@
                               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]);
         }