------------------------------------------------------------ revno: 13038 revision-id: squid3@treenet.co.nz-20131007103647-qesndbp86iodh4fn parent: kinkie@squid-cache.org-20131007102348-5r0eti635e1exdax committer: Amos Jeffries branch nick: trunk timestamp: Mon 2013-10-07 04:36:47 -0600 message: Fix signedness comparison in SBuf ------------------------------------------------------------ # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: squid3@treenet.co.nz-20131007103647-qesndbp86iodh4fn # target_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/ # testament_sha1: d1aaa83f3feeee19d37e636248e34fd5682396dc # timestamp: 2013-10-07 10:55:36 +0000 # source_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/ # base_revision_id: kinkie@squid-cache.org-20131007102348-\ # 5r0eti635e1exdax # # Begin patch === modified file 'src/SBuf.h' --- src/SBuf.h 2013-10-07 08:32:15 +0000 +++ src/SBuf.h 2013-10-07 10:36:47 +0000 @@ -417,7 +417,7 @@ * \throw SBufTooBigException if the user tries to allocate too big a SBuf */ void reserveSpace(size_type minSpace) { - Must(0 <= minSpace); + Must(minSpace < maxSize); Must(length() <= maxSize - minSpace); reserveCapacity(length()+minSpace); }