------------------------------------------------------------
revno: 13041
revision-id: squid3@treenet.co.nz-20131130091625-t1p3cdlzxh1tiian
parent: squid3@treenet.co.nz-20131129105553-6jq20eyny6amcnv8
fixes bug(s): http://bugs.squid-cache.org/show_bug.cgi?id=3972
author: Nathan Hoad <nathan@getoffmalawn.com>
committer: Amos Jeffries <squid3@treenet.co.nz>
branch nick: 3.4
timestamp: Sat 2013-11-30 02:16:25 -0700
message:
  Bug 3972: Segfault when getting the deny info page ID after a reconfigure
  
  Older ACL code was using a stale AclMatchedName value. More recent code resets
  the AclMatchedName global to NULL to avoid leaking the stale value, but that
  may crash strcmp() in aclGetDenyInfoPage(). Long-term, the global should be
  removed, of course.
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@treenet.co.nz-20131130091625-t1p3cdlzxh1tiian
# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.4
# testament_sha1: 4fd1f29dcb912888634db7cab0357bb36830194c
# timestamp: 2013-11-30 09:53:45 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.4
# base_revision_id: squid3@treenet.co.nz-20131129105553-\
#   6jq20eyny6amcnv8
# 
# Begin patch
=== modified file 'src/acl/Gadgets.cc'
--- src/acl/Gadgets.cc	2013-09-28 13:03:58 +0000
+++ src/acl/Gadgets.cc	2013-11-30 09:16:25 +0000
@@ -54,6 +54,11 @@
 err_type
 aclGetDenyInfoPage(AclDenyInfoList ** head, const char *name, int redirect_allowed)
 {
+    if (!name) {
+        debugs(28, 3, "ERR_NONE due to a NULL name");
+        return ERR_NONE;
+    }
+
     AclDenyInfoList *A = NULL;
 
     debugs(28, 8, HERE << "got called for " << name);