From: Christos Tsantilas <christos@chtsanti.net>
Date: Tue, 25 Dec 2018 17:01:39 +0000 (+0000)
Subject: Squid crashes when ICAPS and a sslcrtvalidator used together (#328)
X-Git-Tag: M-staged-PR330~1
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=9d4250625d6d6f018a8d74d1faf09e1f07719cac;p=thirdparty%2Fsquid.git

Squid crashes when ICAPS and a sslcrtvalidator used together (#328)

Squid hits an assertions when tries to remove an comm_close handler from
the already closed connection object.

This is a Measurement Factory project
---

diff --git a/src/adaptation/icap/Xaction.cc b/src/adaptation/icap/Xaction.cc
index c262386e46..62b5cd4428 100644
--- a/src/adaptation/icap/Xaction.cc
+++ b/src/adaptation/icap/Xaction.cc
@@ -741,7 +741,7 @@ Adaptation::Icap::Xaction::handleSecuredPeer(Security::EncryptorAnswer &answer)
     securer = NULL;
 
     if (closer != NULL) {
-        if (answer.conn != NULL)
+        if (Comm::IsConnOpen(answer.conn))
             comm_remove_close_handler(answer.conn->fd, closer);
         else
             closer->cancel("securing completed");