------------------------------------------------------------ revno: 12590 revision-id: squid3@treenet.co.nz-20130713123735-wh3op52v6qc9phf2 parent: squid3@treenet.co.nz-20130711060736-rp5br9oomfdcydpk fixes bug(s): http://bugs.squid-cache.org/show_bug.cgi?id=3869 author: Amos Jeffries , Andrea Gagliardi committer: Amos Jeffries branch nick: 3.3 timestamp: Sat 2013-07-13 06:37:35 -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-20130713123735-wh3op52v6qc9phf2 # target_branch: http://bzr.squid-cache.org/bzr/squid3/3.3 # testament_sha1: d918016af3dfc4cce5b7386ac385c54940931678 # timestamp: 2013-07-13 12:41:31 +0000 # source_branch: http://bzr.squid-cache.org/bzr/squid3/3.3 # base_revision_id: squid3@treenet.co.nz-20130711060736-\ # rp5br9oomfdcydpk # # Begin patch === modified file 'src/MemBuf.h' --- src/MemBuf.h 2012-10-03 17:32:57 +0000 +++ src/MemBuf.h 2013-07-13 12:37:35 +0000 @@ -64,7 +64,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;