Import of OpenSSH 4.4p1

[gssapi-openssh.git] / openssh / uuencode.c

diff --git a/openssh/uuencode.c b/openssh/uuencode.c
index 0a7c8d16af25ee6d2ad78a1b7b39e79a08ec7211..a13949585f8eb4ea1bf12496164927e29ef5a234 100644 (file)
--- a/openssh/uuencode.c
+++ b/openssh/uuencode.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: uuencode.c,v 1.24 2006/08/03 03:34:42 deraadt Exp $ */
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  *
@@ -23,7 +24,11 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: uuencode.c,v 1.17 2003/11/10 16:23:41 jakob Exp $");
+
+#include <sys/types.h>
+#include <netinet/in.h>
+#include <resolv.h>
+#include <stdio.h>
 
 #include "xmalloc.h"
 #include "uuencode.h"
@@ -58,9 +63,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]);