- djm@cvs.openbsd.org 2006/03/25 00:05:41

     [auth-bsdauth.c auth-skey.c auth.c auth2-chall.c channels.c]
     [clientloop.c deattack.c gss-genr.c kex.c key.c misc.c moduli.c]
     [monitor.c monitor_wrap.c packet.c scard.c sftp-server.c ssh-agent.c]
     [ssh-keyscan.c ssh.c sshconnect.c sshconnect2.c sshd.c uuencode.c]
     [xmalloc.c xmalloc.h]
     introduce xcalloc() and xasprintf() failure-checked allocations
     functions and use them throughout openssh

     xcalloc is particularly important because malloc(nmemb * size) is a
     dangerous idiom (subject to integer overflow) and it is time for it
     to die

     feedback and ok deraadt@

1 files changed, 6 insertions, 1 deletions

diff --git a/uuencode.c b/uuencode.c
index 314eb92f3..feda6a016 100644
--- a/uuencode.c
+++ b/uuencode.c
@@ -57,9 +57,14 @@ uudecode(const char *src, u_char *target, size_t targsize)
 void
 dump_base64(FILE *fp, u_char *data, u_int len)
 {
-        char *buf = xmalloc(2*len);
+        char *buf;;
         int i, n;
 
+        if (len > 65536) {
+                fprintf(fp, "dump_base64: len > 65536\n");
+                return;
+        }
+        buf = xmalloc(2*len);
         n = uuencode(data, len, buf, 2*len);
         for (i = 0; i < n; i++) {
                 fprintf(fp, "%c", buf[i]);