[or-cvs] r11004: possible fix for bug 473: always set buf->cur on buf_remove_ (in tor/trunk: . src/or)

[nickm at seul.org]

Author: nickm
Date: 2007-07-31 05:31:15 -0400 (Tue, 31 Jul 2007)
New Revision: 11004

Modified:
   tor/trunk/
   tor/trunk/src/or/buffers.c
Log:
 r14034 at catbus:  nickm | 2007-07-31 05:22:56 -0400
 possible fix for bug 473: always set buf->cur on buf_remove_from_front.



Property changes on: tor/trunk
___________________________________________________________________
 svk:merge ticket from /tor/trunk [r14034] on 8246c3cf-6607-4228-993b-4d95d33730f1

Modified: tor/trunk/src/or/buffers.c
===================================================================
--- tor/trunk/src/or/buffers.c	2007-07-31 06:48:47 UTC (rev 11003)
+++ tor/trunk/src/or/buffers.c	2007-07-31 09:31:15 UTC (rev 11004)
@@ -486,12 +486,12 @@
   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();