------------------------------------------------------------ revno: 11843 revision-id: squid3@treenet.co.nz-20160506091445-4rpxluz7uy16yjlu parent: squid3@treenet.co.nz-20160502034432-vz0ztgpclokcac02 fixes bug: http://bugs.squid-cache.org/show_bug.cgi?id=4455 committer: Amos Jeffries branch nick: 3.2 timestamp: Fri 2016-05-06 21:14:45 +1200 message: Bug 4455: SegFault from ESIInclude::Start ------------------------------------------------------------ # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: squid3@treenet.co.nz-20160506091445-4rpxluz7uy16yjlu # target_branch: http://bzr.squid-cache.org/bzr/squid3/branches\ # /SQUID_3_2 # testament_sha1: 89d5df7c9ec5dd7ed91684e3b701860ea1d38927 # timestamp: 2016-05-06 09:48:24 +0000 # source_branch: http://bzr.squid-cache.org/bzr/squid3/3.2 # base_revision_id: squid3@treenet.co.nz-20160502034432-\ # vz0ztgpclokcac02 # # Begin patch === modified file 'src/client_side_request.cc' --- src/client_side_request.cc 2013-07-13 12:41:08 +0000 +++ src/client_side_request.cc 2016-05-06 09:14:45 +0000 @@ -177,7 +177,9 @@ start_time = current_time; setConn(aConn); al = new AccessLogEntry; - al->tcpClient = clientConnection = aConn->clientConnection; + if (aConn) { + al->tcpClient = clientConnection = aConn->clientConnection; + } dlinkAdd(this, &active, &ClientActiveRequests); #if USE_ADAPTATION request_satisfaction_mode = false;