------------------------------------------------------------
revno: 12699
revision-id: squid3@treenet.co.nz-20160506091321-tza59kjh2g6goob0
parent: squid3@treenet.co.nz-20160502034346-fhtahpk2lfblo2b1
fixes bug: http://bugs.squid-cache.org/show_bug.cgi?id=4455
committer: Amos Jeffries <squid3@treenet.co.nz>
branch nick: 3.3
timestamp: Fri 2016-05-06 21:13:21 +1200
message:
  Bug 4455: SegFault from ESIInclude::Start
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@treenet.co.nz-20160506091321-tza59kjh2g6goob0
# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.3
# testament_sha1: 38abb4bdfae154205356e5b2f0831c63366b511c
# timestamp: 2016-05-06 09:48:36 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.3
# base_revision_id: squid3@treenet.co.nz-20160502034346-\
#   fhtahpk2lfblo2b1
# 
# Begin patch
=== modified file 'src/client_side_request.cc'
--- src/client_side_request.cc	2014-03-09 02:35:19 +0000
+++ src/client_side_request.cc	2016-05-06 09:13:21 +0000
@@ -189,13 +189,15 @@
     start_time = current_time;
     setConn(aConn);
     al = new AccessLogEntry;
-    al->tcpClient = clientConnection = aConn->clientConnection;
+    if (aConn) {
+        al->tcpClient = clientConnection = aConn->clientConnection;
 #if USE_SSL
-    if (aConn->clientConnection != NULL && aConn->clientConnection->isOpen()) {
-        if (SSL *ssl = fd_table[aConn->clientConnection->fd].ssl)
-            al->cache.sslClientCert.reset(SSL_get_peer_certificate(ssl));
+        if (aConn->clientConnection != NULL && aConn->clientConnection->isOpen()) {
+            if (SSL *ssl = fd_table[aConn->clientConnection->fd].ssl)
+                al->cache.sslClientCert.reset(SSL_get_peer_certificate(ssl));
+        }
+#endif
     }
-#endif
     dlinkAdd(this, &active, &ClientActiveRequests);
 #if USE_ADAPTATION
     request_satisfaction_mode = false;