From 253b32b7361cb92581c009824ea0621c566efeba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dag-Erling=20Sm=C3=B8rgrav?= <des@FreeBSD.org>
Date: Wed, 24 Sep 2008 21:17:14 +0000
Subject: [PATCH] Fix "xmalloc: zero size" bug when talking to older servers.
 This patch has been submitted but not yet committed upstream.

Obtained from:	https://bugzilla.mindrot.org/show_bug.cgi?id=1496
MFC after:	1 week
---
 sshconnect2.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sshconnect2.c b/sshconnect2.c
index 389bec9e43b4..067c875df1b9 100644
--- a/sshconnect2.c
+++ b/sshconnect2.c
@@ -386,8 +386,9 @@ input_userauth_banner(int type, u_int32_t seq, void *ctxt)
 	if (options.log_level >= SYSLOG_LEVEL_INFO) {
 		if (len > 65536)
 			len = 65536;
-		msg = xmalloc(len * 4); /* max expansion from strnvis() */
+		msg = xmalloc(len * 4 + 1); /* max expansion from strnvis() */
 		strnvis(msg, raw, len * 4, VIS_SAFE|VIS_OCTAL);
+		msg[len*4] = '\0';
 		fprintf(stderr, "%s", msg);
 		xfree(msg);
 	}