diff options
| author |   markus <markus@openbsd.org> | 2003-09-16 21:02:39 +0000 |
|---|---|---|
| committer | markus <markus@openbsd.org> | 2003-09-16 21:02:39 +0000 |
| commit | d16427222f3bd2979f43dcda8f1558cb77f368e5 (patch) | |
| tree | f95b16142e66ffd772b4445d61acea289be3234a /usr.bin/ssh/buffer.c | |
| parent | Do not use | !FOO to mention undesirable flags, but rather & ~FOO - hopefully (diff) | |
| download | wireguard-openbsd-d16427222f3bd2979f43dcda8f1558cb77f368e5.tar.xz wireguard-openbsd-d16427222f3bd2979f43dcda8f1558cb77f368e5.zip | |
more malloc/fatal fixes; ok millert/deraadt; ghudson at MIT.EDU
Diffstat (limited to 'usr.bin/ssh/buffer.c')
| -rw-r--r-- | usr.bin/ssh/buffer.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/usr.bin/ssh/buffer.c b/usr.bin/ssh/buffer.c index 8ff8c2f48b4..aee293f8bd4 100644 --- a/usr.bin/ssh/buffer.c +++ b/usr.bin/ssh/buffer.c @@ -12,7 +12,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: buffer.c,v 1.17 2003/09/16 03:03:47 deraadt Exp $"); +RCSID("$OpenBSD: buffer.c,v 1.18 2003/09/16 21:02:39 markus Exp $"); #include "xmalloc.h" #include "buffer.h" @@ -23,8 +23,11 @@ RCSID("$OpenBSD: buffer.c,v 1.17 2003/09/16 03:03:47 deraadt 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,10 @@ 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); + xfree(buffer->buf); + } } /* |