diff options
| author | joe <joe@FreeBSD.org> | 2003-09-26 19:15:53 +0000 |
|---|---|---|
| committer | joe <joe@FreeBSD.org> | 2003-09-26 19:15:53 +0000 |
| commit | dc42ef026434942c55e8af3dd0e975d36afc6843 (patch) | |
| tree | f8739ebe09332a7122569bd3e41f1574f5aaa117 /crypto/openssh/buffer.c | |
| parent | 0689a1c0d3a7bf6f827a1f7ee07bdb8d1e3c1fb1 (diff) | |
| download | FreeBSD-src-dc42ef026434942c55e8af3dd0e975d36afc6843.zip FreeBSD-src-dc42ef026434942c55e8af3dd0e975d36afc6843.tar.gz | |
Additional corrections to OpenSSH buffer handling.
Obtained from: openssh.org
Originally committed to head by: nectar
Diffstat (limited to 'crypto/openssh/buffer.c')
| -rw-r--r-- | crypto/openssh/buffer.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/crypto/openssh/buffer.c b/crypto/openssh/buffer.c index 8ff8c2f..9c9ca64 100644 --- a/crypto/openssh/buffer.c +++ b/crypto/openssh/buffer.c @@ -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); + } } /* |
