------------------------------------------------------------
revno: 12666
revision-id: squid3@treenet.co.nz-20131130091858-twmvvsoifzvvltd0
parent: squid3@treenet.co.nz-20131130091707-jo49nw1xcvozbz5r
author: Nathan Hoad <nathan@getoffmalawn.com>
committer: Amos Jeffries <squid3@treenet.co.nz>
branch nick: 3.3
timestamp: Sat 2013-11-30 02:18:58 -0700
message:
  Protect aclIsProxyAuth() debugging from NULL names (via NULL AclMatchedName).
  
  Related to Bug 3972 fix
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@treenet.co.nz-20131130091858-twmvvsoifzvvltd0
# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.3
# testament_sha1: 1dad78befb7ab1dad93336b41440d534884dbc30
# timestamp: 2013-11-30 09:53:26 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.3
# base_revision_id: squid3@treenet.co.nz-20131130091707-\
#   jo49nw1xcvozbz5r
# 
# Begin patch
=== modified file 'src/acl/Gadgets.cc'
--- src/acl/Gadgets.cc	2013-11-30 09:17:07 +0000
+++ src/acl/Gadgets.cc	2013-11-30 09:18:58 +0000
@@ -87,11 +87,13 @@
 int
 aclIsProxyAuth(const char *name)
 {
+    if (!name) {
+        debugs(28, 3, "false due to a NULL name");
+        return false;
+    }
+
     debugs(28, 5, "aclIsProxyAuth: called for " << name);
 
-    if (NULL == name)
-        return false;
-
     ACL *a;
 
     if ((a = ACL::FindByName(name))) {