1 files changed, 12 insertions, 5 deletions

diff --git a/buffer.c b/buffer.c
index 983f6bc2f..a80880bb9 100644
--- a/buffer.c
+++ b/buffer.c
@@ -12,7 +12,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: buffer.c,v 1.16 2002/06/26 08:54:18 markus Exp $");
+RCSID("$OpenBSD: buffer.c,v 1.19 2003/09/18 07:54:48 markus Exp $");
 
 #include "xmalloc.h"
 #include "buffer.h"
@@ -23,8 +23,11 @@ RCSID("$OpenBSD: buffer.c,v 1.16 2002/06/26 08:54:18 markus Exp $");
 void
 buffer_init(Buffer *buffer)
 {
-        buffer->alloc = 4096;
-        buffer->buf = xmalloc(buffer->alloc);
+        const u_int len = 4096;
+
+        buffer->alloc = 0;
+        buffer->buf = xmalloc(len);
+        buffer->alloc = len;
         buffer->offset = 0;
         buffer->end = 0;
 }
@@ -34,8 +37,11 @@ buffer_init(Buffer *buffer)
 void
 buffer_free(Buffer *buffer)
 {
-        memset(buffer->buf, 0, buffer->alloc);
-        xfree(buffer->buf);
+        if (buffer->alloc > 0) {
+                memset(buffer->buf, 0, buffer->alloc);
+                buffer->alloc = 0;
+                xfree(buffer->buf);
+        }
 }
 
 /*
@@ -99,6 +105,7 @@ restart:
                 goto restart;
         }
         /* Increase the size of the buffer and retry. */
+        
         newlen = buffer->alloc + len + 32768;
         if (newlen > 0xa00000)
                 fatal("buffer_append_space: alloc %u not supported",