From 22d62d310d817b7e7acf43d966a988adcb605a13 Mon Sep 17 00:00:00 2001 From: djm Date: Wed, 26 Jun 2002 09:14:25 +0000 Subject: [PATCH] - markus@cvs.openbsd.org 2002/06/26 08:54:18 [buffer.c] limit append to 1MB and buffers to 10MB --- ChangeLog | 3 +++ buffer.c | 8 +++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 0bcad49a..33840488 100644 --- a/ChangeLog +++ b/ChangeLog @@ -39,6 +39,9 @@ - markus@cvs.openbsd.org 2002/06/26 08:53:12 [bufaux.c] limit size of BNs to 8KB; ok provos/deraadt + - markus@cvs.openbsd.org 2002/06/26 08:54:18 + [buffer.c] + limit append to 1MB and buffers to 10MB 20020625 - (stevesk) [INSTALL acconfig.h configure.ac defines.h] remove --with-rsh 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 */ -- 2.45.2