From: Amos Jeffries <squid3@treenet.co.nz>
Date: Mon, 18 Mar 2013 05:37:36 +0000 (-0600)
Subject: Add missing NULL check in myportname ACL
X-Git-Tag: SQUID_3_4_0_1~232
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1d5613fb2f42d9521528b6f1c664bac17075f000;p=thirdparty%2Fsquid.git

Add missing NULL check in myportname ACL
---

diff --git a/src/acl/MyPortName.cc b/src/acl/MyPortName.cc
index f2d5ebb92c..c00bcb11f8 100644
--- a/src/acl/MyPortName.cc
+++ b/src/acl/MyPortName.cc
@@ -32,9 +32,9 @@
  */
 
 #include "squid.h"
+#include "acl/Checklist.h"
 #include "acl/MyPortName.h"
 #include "acl/StringData.h"
-#include "acl/Checklist.h"
 #include "anyp/PortCfg.h"
 #include "HttpRequest.h"
 
@@ -44,7 +44,7 @@
 int
 ACLMyPortNameStrategy::match(ACLData<MatchType> * &data, ACLFilledChecklist *checklist, ACLFlags &)
 {
-    if (checklist->conn() != NULL)
+    if (checklist->conn() != NULL && checklist->conn()->port != NULL)
         return data->match(checklist->conn()->port->name);
     if (checklist->request != NULL)
         return data->match(checklist->request->myportname.termedBuf());