From: Christos Tsantilas <chtsanti@users.sourceforge.net>
Date: Sat, 16 Feb 2013 17:05:36 +0000 (+0200)
Subject: Fix segfault inside Adaptation::AccessCheck::checkCandidates method
X-Git-Tag: SQUID_3_4_0_1~272
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=eced1234fa08e5822b0271181d34583e5dd14677;p=thirdparty%2Fsquid.git

Fix segfault inside Adaptation::AccessCheck::checkCandidates method

The realted HttpReply object maybe is NULL, for example for icap reqmod
requests. We should always check  before using it with HTTPMSGLOCK macro
---

diff --git a/src/adaptation/AccessCheck.cc b/src/adaptation/AccessCheck.cc
index f2ce917634..aaa8b97278 100644
--- a/src/adaptation/AccessCheck.cc
+++ b/src/adaptation/AccessCheck.cc
@@ -122,8 +122,8 @@ Adaptation::AccessCheck::checkCandidates()
             /* BUG 2526: what to do when r->acl is empty?? */
             // XXX: we do not have access to conn->rfc931 here.
             acl_checklist = new ACLFilledChecklist(r->acl, filter.request, dash_str);
-            acl_checklist->reply = filter.reply;
-            HTTPMSGLOCK(acl_checklist->reply);
+            if ((acl_checklist->reply = filter.reply))
+                HTTPMSGLOCK(acl_checklist->reply);
             acl_checklist->nonBlockingCheck(AccessCheckCallbackWrapper, this);
             return;
         }