------------------------------------------------------------ revno: 11825 revision-id: squid3@treenet.co.nz-20130713123806-pteg9ouzldmxpu8h parent: squid3@treenet.co.nz-20130711052356-q193iaa08xajaq2r fixes bug(s): http://bugs.squid-cache.org/show_bug.cgi?id=3869 author: Amos Jeffries , Andrea Gagliardi committer: Amos Jeffries branch nick: 3.2 timestamp: Sat 2013-07-13 06:38:06 -0600 message: Bug 3869: assertion failed: MemBuf.cc:272: size < capacity ------------------------------------------------------------ # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: squid3@treenet.co.nz-20130713123806-pteg9ouzldmxpu8h # target_branch: http://bzr.squid-cache.org/bzr/squid3/branches\ # /SQUID_3_2 # testament_sha1: 2676f3535119cd342686cd61fea35d1b8d2ffd20 # timestamp: 2013-07-13 12:41:39 +0000 # source_branch: http://bzr.squid-cache.org/bzr/squid3/branches\ # /SQUID_3_2 # base_revision_id: squid3@treenet.co.nz-20130711052356-\ # q193iaa08xajaq2r # # Begin patch === modified file 'src/MemBuf.h' --- src/MemBuf.h 2009-12-26 00:25:57 +0000 +++ src/MemBuf.h 2013-07-13 12:38:06 +0000 @@ -66,7 +66,7 @@ /// these space-related methods assume no growth and allow 0-termination char *space() { return buf + size; } // space to add data - char *space(mb_size_t required) { if (size + required > capacity) grow(size + required); return buf + size; } // space to add data + char *space(mb_size_t required) { if (size + required >= capacity) grow(size + required +1); return buf + size; } // space to add data mb_size_t spaceSize() const;