]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
Fix segfault inside Adaptation::AccessCheck::checkCandidates method
authorChristos Tsantilas <chtsanti@users.sourceforge.net>
Sat, 16 Feb 2013 17:05:36 +0000 (19:05 +0200)
committerChristos Tsantilas <chtsanti@users.sourceforge.net>
Sat, 16 Feb 2013 17:05:36 +0000 (19:05 +0200)
The realted HttpReply object maybe is NULL, for example for icap reqmod
requests. We should always check  before using it with HTTPMSGLOCK macro

src/adaptation/AccessCheck.cc

index f2ce917634c5cc198f56edd13d24beba22e6022d..aaa8b97278f8df4b89df2c525deadcdc9ecd5e5a 100644 (file)
@@ -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;
         }