From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sun, 29 Jun 2008 13:03:44 +0000 (+1200)
Subject: Rollback rev 9046-9047. Not quite right.
X-Git-Tag: SQUID_3_1_0_1~49^2~185
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d4769ed5049b436af27f06d0c70e71b64a056778;p=thirdparty%2Fsquid.git

Rollback rev 9046-9047. Not quite right.
---

diff --git a/src/MemBuf.cc b/src/MemBuf.cc
index 3e073b6dd1..b08cb7d8a7 100644
--- a/src/MemBuf.cc
+++ b/src/MemBuf.cc
@@ -226,19 +226,13 @@ void MemBuf::consume(mb_size_t shiftSize)
     PROF_stop(MemBuf_consume);
 }
 
-/**
- * calls memcpy, appends exactly size bytes,
- * extends buffer or creates buffer if needed.
- */
+// calls memcpy, appends exactly size bytes, extends buffer if needed
 void MemBuf::append(const char *newContent, mb_size_t sz)
 {
     assert(sz >= 0);
+    assert(buf);
     assert(!stolen); /* not frozen */
 
-    if(!buf) {
-        grow((int)sz+1, MEM_BUF_MAX_SIZE);
-    }
-
     PROF_start(MemBuf_append);
     if (sz > 0) {
         if (size + sz + 1 > capacity)
@@ -253,7 +247,7 @@ void MemBuf::append(const char *newContent, mb_size_t sz)
     PROF_stop(MemBuf_append);
 }
 
-/// updates content size after external append
+// updates content size after external append
 void MemBuf::appended(mb_size_t sz)
 {
     assert(size + sz <= capacity);