diff options
author | Jacques Vidrine <nectar@FreeBSD.org> | 2003-09-16 06:11:58 +0000 |
---|---|---|
committer | Jacques Vidrine <nectar@FreeBSD.org> | 2003-09-16 06:11:58 +0000 |
commit | 8947bcb7563b1a4e31be4bd15c07393000b6089f (patch) | |
tree | c58c3115c56af308f662f9bddeeed7eb37cc33c8 | |
parent | af8524a91e1528c2c3ab52a25c06afacbc581078 (diff) |
Notes
-rw-r--r-- | crypto/openssh/buffer.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/crypto/openssh/buffer.c b/crypto/openssh/buffer.c index ad04b267e0d8c..8ff8c2f48b4f2 100644 --- a/crypto/openssh/buffer.c +++ b/crypto/openssh/buffer.c @@ -12,7 +12,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: buffer.c,v 1.16 2002/06/26 08:54:18 markus Exp $"); +RCSID("$OpenBSD: buffer.c,v 1.17 2003/09/16 03:03:47 deraadt Exp $"); #include "xmalloc.h" #include "buffer.h" @@ -69,6 +69,7 @@ buffer_append(Buffer *buffer, const void *data, u_int len) void * buffer_append_space(Buffer *buffer, u_int len) { + u_int newlen; void *p; if (len > 0x100000) @@ -98,11 +99,13 @@ restart: goto restart; } /* Increase the size of the buffer and retry. */ - buffer->alloc += len + 32768; - if (buffer->alloc > 0xa00000) + + newlen = buffer->alloc + len + 32768; + if (newlen > 0xa00000) fatal("buffer_append_space: alloc %u not supported", - buffer->alloc); - buffer->buf = xrealloc(buffer->buf, buffer->alloc); + newlen); + buffer->buf = xrealloc(buffer->buf, newlen); + buffer->alloc = newlen; goto restart; /* NOTREACHED */ } |