- markus@cvs.openbsd.org 2003/09/18 07:54:48

     [buffer.c]
     protect against double free; #660;  zardoz at users.sf.net

diff --git a/ChangeLog b/ChangeLog
index 9d7a9cfd0d2ef5941970db744326b355f6472440..5e9b2a5bf9dbb04c3a0b45a49f23915b576fea3f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -33,6 +33,9 @@
    - markus@cvs.openbsd.org 2003/09/18 07:52:54
      [sshconnect.c]
      missing {}; bug #656; jclonguet at free.fr
+   - markus@cvs.openbsd.org 2003/09/18 07:54:48
+     [buffer.c]
+     protect against double free; #660;  zardoz at users.sf.net
 
 20030919
  - (djm) Bug #683: Remove reference to --with-ipv4-default from INSTALL;

diff --git a/buffer.c b/buffer.c
index aee293f8bd4092bc2c0020bc4170faadb8dcb057..a80880bb923dfedd1b9b6dec446c09b5f12b44da 100644 (file)
--- a/buffer.c
+++ b/buffer.c
@@ -12,7 +12,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: buffer.c,v 1.18 2003/09/16 21:02:39 markus Exp $");
+RCSID("$OpenBSD: buffer.c,v 1.19 2003/09/18 07:54:48 markus Exp $");
 
 #include "xmalloc.h"
 #include "buffer.h"
@@ -39,6 +39,7 @@ buffer_free(Buffer *buffer)
 {
        if (buffer->alloc > 0) {
                memset(buffer->buf, 0, buffer->alloc);
+               buffer->alloc = 0;
                xfree(buffer->buf);
        }
 }