------------------------------------------------------------ revno: 13807 revision-id: squid3@treenet.co.nz-20150423120452-9lwvrfordhcx1la2 parent: squid3@treenet.co.nz-20150423120338-l0rjsjyh59snuwf2 committer: Amos Jeffries branch nick: 3.5 timestamp: Thu 2015-04-23 05:04:52 -0700 message: Ensure class Lock counter remains within bounds ------------------------------------------------------------ # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: squid3@treenet.co.nz-20150423120452-9lwvrfordhcx1la2 # target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 # testament_sha1: a883a9ff1b3d15664988e80283cf8be5fd456d55 # timestamp: 2015-04-23 12:12:49 +0000 # source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 # base_revision_id: squid3@treenet.co.nz-20150423120338-\ # l0rjsjyh59snuwf2 # # Begin patch === modified file 'src/base/Lock.h' --- src/base/Lock.h 2015-04-09 02:01:55 +0000 +++ src/base/Lock.h 2015-04-23 12:04:52 +0000 @@ -35,6 +35,7 @@ #if defined(LOCKCOUNT_DEBUG) old_debug(0,1)("Incrementing this %p from count %u\n",this,count_); #endif + assert(count_ < UINT32_MAX); ++count_; }