summaryrefslogtreecommitdiff
path: root/buffer.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2002-06-26 19:14:25 +1000
committerDamien Miller <djm@mindrot.org>2002-06-26 19:14:25 +1000
commit468cd716a54ac1fb85d24e6d270d824e460267b2 (patch)
treebae5aaf08c284977040b159556500fdd6733b2bf /buffer.c
parentaa15137c15d2fe6ca4d802c02c6f844072648936 (diff)
downloadopenssh-git-468cd716a54ac1fb85d24e6d270d824e460267b2.tar.gz
- markus@cvs.openbsd.org 2002/06/26 08:54:18
[buffer.c] limit append to 1MB and buffers to 10MB
Diffstat (limited to 'buffer.c')
-rw-r--r--buffer.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/buffer.c b/buffer.c
index 40572e5a..ad04b267 100644
--- a/buffer.c
+++ b/buffer.c
@@ -12,7 +12,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: buffer.c,v 1.15 2002/01/18 18:14:17 stevesk Exp $");
+RCSID("$OpenBSD: buffer.c,v 1.16 2002/06/26 08:54:18 markus Exp $");
#include "xmalloc.h"
#include "buffer.h"
@@ -71,6 +71,9 @@ buffer_append_space(Buffer *buffer, u_int len)
{
void *p;
+ if (len > 0x100000)
+ fatal("buffer_append_space: len %u not supported", len);
+
/* If the buffer is empty, start using it from the beginning. */
if (buffer->offset == buffer->end) {
buffer->offset = 0;
@@ -96,6 +99,9 @@ restart:
}
/* Increase the size of the buffer and retry. */
buffer->alloc += len + 32768;
+ if (buffer->alloc > 0xa00000)
+ fatal("buffer_append_space: alloc %u not supported",
+ buffer->alloc);
buffer->buf = xrealloc(buffer->buf, buffer->alloc);
goto restart;
/* NOTREACHED */