diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | buffer.c | 3 |
2 files changed, 6 insertions, 2 deletions
@@ -33,6 +33,9 @@ | |||
33 | - markus@cvs.openbsd.org 2003/09/18 07:52:54 | 33 | - markus@cvs.openbsd.org 2003/09/18 07:52:54 |
34 | [sshconnect.c] | 34 | [sshconnect.c] |
35 | missing {}; bug #656; jclonguet at free.fr | 35 | missing {}; bug #656; jclonguet at free.fr |
36 | - markus@cvs.openbsd.org 2003/09/18 07:54:48 | ||
37 | [buffer.c] | ||
38 | protect against double free; #660; zardoz at users.sf.net | ||
36 | 39 | ||
37 | 20030919 | 40 | 20030919 |
38 | - (djm) Bug #683: Remove reference to --with-ipv4-default from INSTALL; | 41 | - (djm) Bug #683: Remove reference to --with-ipv4-default from INSTALL; |
@@ -1169,4 +1172,4 @@ | |||
1169 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. | 1172 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. |
1170 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au | 1173 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au |
1171 | 1174 | ||
1172 | $Id: ChangeLog,v 1.3024 2003/09/22 10:59:16 dtucker Exp $ | 1175 | $Id: ChangeLog,v 1.3025 2003/09/22 11:00:19 dtucker Exp $ |
@@ -12,7 +12,7 @@ | |||
12 | */ | 12 | */ |
13 | 13 | ||
14 | #include "includes.h" | 14 | #include "includes.h" |
15 | RCSID("$OpenBSD: buffer.c,v 1.18 2003/09/16 21:02:39 markus Exp $"); | 15 | RCSID("$OpenBSD: buffer.c,v 1.19 2003/09/18 07:54:48 markus Exp $"); |
16 | 16 | ||
17 | #include "xmalloc.h" | 17 | #include "xmalloc.h" |
18 | #include "buffer.h" | 18 | #include "buffer.h" |
@@ -39,6 +39,7 @@ buffer_free(Buffer *buffer) | |||
39 | { | 39 | { |
40 | if (buffer->alloc > 0) { | 40 | if (buffer->alloc > 0) { |
41 | memset(buffer->buf, 0, buffer->alloc); | 41 | memset(buffer->buf, 0, buffer->alloc); |
42 | buffer->alloc = 0; | ||
42 | xfree(buffer->buf); | 43 | xfree(buffer->buf); |
43 | } | 44 | } |
44 | } | 45 | } |