------------------------------------------------------------ revno: 11753 revision-id: squid3@treenet.co.nz-20130128054006-pxm5jfqt3udui265 parent: squid3@treenet.co.nz-20130128053919-yt8i1uosnt4e80cl author: Francesco Chemolli committer: Amos Jeffries branch nick: 3.2 timestamp: Sun 2013-01-27 22:40:06 -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-20130128054006-pxm5jfqt3udui265 # target_branch: http://bzr.squid-cache.org/bzr/squid3/branches\ # /SQUID_3_2 # testament_sha1: 8fe9814832dd8f6e996c9b5ca58219aa21d24f26 # timestamp: 2013-01-28 05:45:15 +0000 # source_branch: http://bzr.squid-cache.org/bzr/squid3/branches\ # /SQUID_3_2 # base_revision_id: squid3@treenet.co.nz-20130128053919-\ # yt8i1uosnt4e80cl # # Begin patch === modified file 'src/cache_cf.cc' --- src/cache_cf.cc 2012-11-29 11:20:18 +0000 +++ src/cache_cf.cc 2013-01-28 05:40:06 +0000 @@ -2240,7 +2240,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); @@ -4135,7 +4135,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]); }