------------------------------------------------------------ revno: 11383 revision-id: squid3@treenet.co.nz-20111024022732-fr9admzotjfxamq1 parent: squid3@treenet.co.nz-20111024022558-ont2jqqprbf2ag89 author: Francesco Chemolli committer: Amos Jeffries branch nick: SQUID_3_2 timestamp: Sun 2011-10-23 20:27:32 -0600 message: Added null pointer guard in HttpStateData::cacheableReply() ------------------------------------------------------------ # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: squid3@treenet.co.nz-20111024022732-fr9admzotjfxamq1 # target_branch: http://bzr.squid-cache.org/bzr/squid3/branches\ # /SQUID_3_2/ # testament_sha1: 5f870712f3239d650a0f5a16197f366f2403c992 # timestamp: 2011-10-24 02:38:50 +0000 # source_branch: http://bzr.squid-cache.org/bzr/squid3/branches\ # /SQUID_3_2 # base_revision_id: squid3@treenet.co.nz-20111024022558-\ # ont2jqqprbf2ag89 # # Begin patch === modified file 'src/http.cc' --- src/http.cc 2011-10-08 07:44:05 +0000 +++ src/http.cc 2011-10-24 02:27:32 +0000 @@ -382,7 +382,7 @@ * RFC 2068, sec 14.9.4 */ - if (!request->cache_control->Public()) { + if (!request->cache_control || !request->cache_control->Public()) { if (!REFRESH_OVERRIDE(ignore_auth)) return 0; }