------------------------------------------------------------ revno: 12595 revision-id: squid3@treenet.co.nz-20130726114037-2755jhbd13je7zvi parent: squid3@treenet.co.nz-20130722050911-8xb2ilctcs9jquz0 committer: Amos Jeffries branch nick: 3.3 timestamp: Fri 2013-07-26 05:40:37 -0600 message: Fix assert() with side effects assert() may be completely removed by precompiler when optimizing. Such that the code conditional never gets run. ------------------------------------------------------------ # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: squid3@treenet.co.nz-20130726114037-2755jhbd13je7zvi # target_branch: http://bzr.squid-cache.org/bzr/squid3/3.3 # testament_sha1: 8d8f3151202b5933b732cb00614aaa41c016ad29 # timestamp: 2013-07-26 11:54:31 +0000 # source_branch: http://bzr.squid-cache.org/bzr/squid3/3.3 # base_revision_id: squid3@treenet.co.nz-20130722050911-\ # 8xb2ilctcs9jquz0 # # Begin patch === modified file 'src/HttpRequest.cc' --- src/HttpRequest.cc 2012-09-25 15:36:18 +0000 +++ src/HttpRequest.cc 2013-07-26 11:40:37 +0000 @@ -229,7 +229,8 @@ copy->extacl_log = extacl_log; copy->extacl_message = extacl_message; - assert(copy->inheritProperties(this)); + const bool inheritWorked = copy->inheritProperties(this); + assert(inheritWorked); return copy; }