From: deraadt@openbsd.org <deraadt@openbsd.org>
Date: Fri, 24 Apr 2015 01:36:24 +0000 (+0000)
Subject: upstream commit
X-Git-Tag: V_6_9_P1~101
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8ac2ffd7aa06042f6b924c87139f2fea5c5682f7;p=thirdparty%2Fopenssh-portable.git

upstream commit

2*len -> use xreallocarray() ok djm
---

diff --git a/uuencode.c b/uuencode.c
index 294c74304..7fc867a11 100644
--- a/uuencode.c
+++ b/uuencode.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uuencode.c,v 1.27 2013/05/17 00:13:14 djm Exp $ */
+/* $OpenBSD: uuencode.c,v 1.28 2015/04/24 01:36:24 deraadt Exp $ */
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  *
@@ -82,7 +82,7 @@ dump_base64(FILE *fp, const u_char *data, u_int len)
 		fprintf(fp, "dump_base64: len > 65536\n");
 		return;
 	}
-	buf = xmalloc(2*len);
+	buf = xreallocarray(NULL, 2, len);
 	n = uuencode(data, len, buf, 2*len);
 	for (i = 0; i < n; i++) {
 		fprintf(fp, "%c", buf[i]);