diff options
author | Colin Watson <cjwatson@debian.org> | 2009-12-29 21:38:40 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2009-12-29 21:38:40 +0000 |
commit | 1b816ea846aca3ee89e7995373ace609e9518424 (patch) | |
tree | b41cdc8495cae7fa9c2e0f98a5f2e71656b61f9a /uuencode.c | |
parent | fa585019a79ebcb4e0202b1c33f87ff1c5c9ce1c (diff) | |
parent | 086ea76990b1e6287c24b6db74adffd4605eb3b0 (diff) |
import openssh-4.6p1-gsskex-20070312.patch
Diffstat (limited to 'uuencode.c')
-rw-r--r-- | uuencode.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/uuencode.c b/uuencode.c index 0a7c8d16a..a13949585 100644 --- a/uuencode.c +++ b/uuencode.c | |||
@@ -1,3 +1,4 @@ | |||
1 | /* $OpenBSD: uuencode.c,v 1.24 2006/08/03 03:34:42 deraadt Exp $ */ | ||
1 | /* | 2 | /* |
2 | * Copyright (c) 2000 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. |
3 | * | 4 | * |
@@ -23,7 +24,11 @@ | |||
23 | */ | 24 | */ |
24 | 25 | ||
25 | #include "includes.h" | 26 | #include "includes.h" |
26 | RCSID("$OpenBSD: uuencode.c,v 1.17 2003/11/10 16:23:41 jakob Exp $"); | 27 | |
28 | #include <sys/types.h> | ||
29 | #include <netinet/in.h> | ||
30 | #include <resolv.h> | ||
31 | #include <stdio.h> | ||
27 | 32 | ||
28 | #include "xmalloc.h" | 33 | #include "xmalloc.h" |
29 | #include "uuencode.h" | 34 | #include "uuencode.h" |
@@ -58,9 +63,14 @@ uudecode(const char *src, u_char *target, size_t targsize) | |||
58 | void | 63 | void |
59 | dump_base64(FILE *fp, u_char *data, u_int len) | 64 | dump_base64(FILE *fp, u_char *data, u_int len) |
60 | { | 65 | { |
61 | char *buf = xmalloc(2*len); | 66 | char *buf; |
62 | int i, n; | 67 | int i, n; |
63 | 68 | ||
69 | if (len > 65536) { | ||
70 | fprintf(fp, "dump_base64: len > 65536\n"); | ||
71 | return; | ||
72 | } | ||
73 | buf = xmalloc(2*len); | ||
64 | n = uuencode(data, len, buf, 2*len); | 74 | n = uuencode(data, len, buf, 2*len); |
65 | for (i = 0; i < n; i++) { | 75 | for (i = 0; i < n; i++) { |
66 | fprintf(fp, "%c", buf[i]); | 76 | fprintf(fp, "%c", buf[i]); |