From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 31 Jul 2007 09:31:15 +0000 (+0000)
Subject:  r14034@catbus:  nickm | 2007-07-31 05:22:56 -0400
X-Git-Tag: tor-0.2.0.4-alpha@11197~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=480db0f00ada1c7bd7d580324c1bd346b9028afa;p=thirdparty%2Ftor.git

 r14034@catbus:  nickm | 2007-07-31 05:22:56 -0400
 possible fix for bug 473: always set buf->cur on buf_remove_from_front.


svn:r11004
---

diff --git a/src/or/buffers.c b/src/or/buffers.c
index 3904b091ef..3af8af6caa 100644
--- a/src/or/buffers.c
+++ b/src/or/buffers.c
@@ -486,12 +486,12 @@ buf_remove_from_front(buf_t *buf, size_t n)
   if (buf->datalen) {
     buf->cur = _wrap_ptr(buf, buf->cur+n);
   } else {
+    buf->cur = buf->mem;
     if (IS_FREELIST_SIZE(buf->len)) {
       buf->highwater = 0;
+
       if (add_buf_mem_to_freelist(buf))
         return;
-    } else {
-      buf->cur = buf->mem;
     }
   }
   check();