diff options
| author |   markus <markus@openbsd.org> | 2005-03-14 11:46:56 +0000 |
|---|---|---|
| committer | markus <markus@openbsd.org> | 2005-03-14 11:46:56 +0000 |
| commit | a1d3689b8a6afe6d0225980eb0f4811c23b275dd (patch) | |
| tree | edc2a78d3c89e003c5b5df6cf443a6aa54729474 /usr.bin/ssh/buffer.c | |
| parent | Populate host for log message for logins denied by AllowUsers and DenyUsers. (diff) | |
| download | wireguard-openbsd-a1d3689b8a6afe6d0225980eb0f4811c23b275dd.tar.xz wireguard-openbsd-a1d3689b8a6afe6d0225980eb0f4811c23b275dd.zip | |
limit input buffer size for channels; bugzilla #896; with and ok dtucker@
Diffstat (limited to 'usr.bin/ssh/buffer.c')
| -rw-r--r-- | usr.bin/ssh/buffer.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/usr.bin/ssh/buffer.c b/usr.bin/ssh/buffer.c index 1a25004ba2b..487e0810598 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.22 2004/10/29 23:56:17 djm Exp $"); +RCSID("$OpenBSD: buffer.c,v 1.23 2005/03/14 11:46:56 markus Exp $"); #include "xmalloc.h" #include "buffer.h" @@ -78,7 +78,7 @@ buffer_append_space(Buffer *buffer, u_int len) u_int newlen; void *p; - if (len > 0x100000) + if (len > BUFFER_MAX_CHUNK) fatal("buffer_append_space: len %u not supported", len); /* If the buffer is empty, start using it from the beginning. */ @@ -97,7 +97,7 @@ restart: * If the buffer is quite empty, but all data is at the end, move the * data to the beginning and retry. */ - if (buffer->offset > buffer->alloc / 2) { + if (buffer->offset > MIN(buffer->alloc, BUFFER_MAX_CHUNK)) { memmove(buffer->buf, buffer->buf + buffer->offset, buffer->end - buffer->offset); buffer->end -= buffer->offset; @@ -107,7 +107,7 @@ restart: /* Increase the size of the buffer and retry. */ newlen = buffer->alloc + len + 32768; - if (newlen > 0xa00000) + if (newlen > BUFFER_MAX_LEN) fatal("buffer_append_space: alloc %u not supported", newlen); buffer->buf = xrealloc(buffer->buf, newlen); |