]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
Fix error in config parser which would mis-assign the sslcrlfile directive.
authorFrancesco Chemolli <kinkie@squid-cache.org>
Wed, 2 Jan 2013 09:59:44 +0000 (02:59 -0700)
committerAmos Jeffries <squid3@treenet.co.nz>
Wed, 2 Jan 2013 09:59:44 +0000 (02:59 -0700)
Also, fix potentially crashing flaw in CPU affinity map display code.

  Detected by Coverity Scan, defects 740336 and 740337.

src/cache_cf.cc

index ebb57a526f4555897d7e1e3e6dcb25c781c25461..11305bd7dbafc86119eee67baefac5381fb7718b 100644 (file)
@@ -2282,7 +2282,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);
@@ -4179,7 +4179,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]);
         }