summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--buffer.c10
-rw-r--r--debian/changelog6
2 files changed, 12 insertions, 4 deletions
diff --git a/buffer.c b/buffer.c
index ad04b267e..983f6bc2f 100644
--- a/buffer.c
+++ b/buffer.c
@@ -69,6 +69,7 @@ buffer_append(Buffer *buffer, const void *data, u_int len)
69void * 69void *
70buffer_append_space(Buffer *buffer, u_int len) 70buffer_append_space(Buffer *buffer, u_int len)
71{ 71{
72 u_int newlen;
72 void *p; 73 void *p;
73 74
74 if (len > 0x100000) 75 if (len > 0x100000)
@@ -98,11 +99,12 @@ restart:
98 goto restart; 99 goto restart;
99 } 100 }
100 /* Increase the size of the buffer and retry. */ 101 /* Increase the size of the buffer and retry. */
101 buffer->alloc += len + 32768; 102 newlen = buffer->alloc + len + 32768;
102 if (buffer->alloc > 0xa00000) 103 if (newlen > 0xa00000)
103 fatal("buffer_append_space: alloc %u not supported", 104 fatal("buffer_append_space: alloc %u not supported",
104 buffer->alloc); 105 newlen);
105 buffer->buf = xrealloc(buffer->buf, buffer->alloc); 106 buffer->buf = xrealloc(buffer->buf, newlen);
107 buffer->alloc = newlen;
106 goto restart; 108 goto restart;
107 /* NOTREACHED */ 109 /* NOTREACHED */
108} 110}
diff --git a/debian/changelog b/debian/changelog
index b194b4296..f93aacd3a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,12 @@ openssh (1:3.6.1p2-7) UNRELEASED; urgency=low
10 10
11 -- Colin Watson <cjwatson@debian.org> Thu, 11 Sep 2003 11:45:35 +0100 11 -- Colin Watson <cjwatson@debian.org> Thu, 11 Sep 2003 11:45:35 +0100
12 12
13openssh (1:3.6.1p2-6.0) unstable; urgency=high
14
15 * SECURITY: fix for CAN-2003-0693, buffer allocation error
16
17 -- Michael Stone <mstone@debian.org> Tue, 16 Sep 2003 08:27:07 -0400
18
13openssh (1:3.6.1p2-6) unstable; urgency=medium 19openssh (1:3.6.1p2-6) unstable; urgency=medium
14 20
15 * Use a more CVS-friendly means of setting SSH_VERSION. 21 * Use a more CVS-friendly means of setting SSH_VERSION.