Return-path: <chris@arachsys.com>
Envelope-to: chris+sent@arachsys.com
Received: from arachsys.demon.co.uk ([83.104.159.199] helo=miranda.arachsys.com)
	by alpha.arachsys.com with esmtpa (Exim 4.52)
	id 1L4v6N-0001hc-Ug; Tue, 25 Nov 2008 10:25:04 +0000
Received: from chris by miranda.arachsys.com with local (Exim 4.52)
	id 1L4v6M-0002Dl-SC; Tue, 25 Nov 2008 10:25:02 +0000
Date: Tue, 25 Nov 2008 10:25:02 +0000
From: Chris Webb <chris@arachsys.com>
To: qemu-devel@nongnu.org, kvm@vger.kernel.org
Cc: Thiemo Seufer <ths@networkno.de>
Subject: [PATCH v2] Fix off-by-one bug limiting VNC passwords to 7 chars
Message-ID: <20081125102502.GJ2380@arachsys.com>
References: <20081123113147.GA12832@arachsys.com> <20081123123101.GC17042@networkno.de> <20081125100935.GI2380@arachsys.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20081125100935.GI2380@arachsys.com>
User-Agent: Mutt/1.5.18 (2008-05-17)

Fix off-by-one bug limiting VNC passwords to 7 characters instead of 8

monitor_readline expects buf_size to include the terminating \0, but
do_change_vnc in monitor.c calls it as though it doesn't. The other site
where monitor_readline reads a password (in vl.c) passes the buffer length
correctly.

Signed-off-by: Chris Webb <chris@arachsys.com>
---
 monitor.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/monitor.c b/monitor.c
index 22360fc..a252838 100644
--- a/monitor.c
+++ b/monitor.c
@@ -433,8 +433,7 @@ static void do_change_vnc(const char *target)
     if (strcmp(target, "passwd") == 0 ||
 	strcmp(target, "password") == 0) {
 	char password[9];
-	monitor_readline("Password: ", 1, password, sizeof(password)-1);
-	password[sizeof(password)-1] = '\0';
+	monitor_readline("Password: ", 1, password, sizeof(password));
 	if (vnc_display_password(NULL, password) < 0)
 	    term_printf("could not set VNC server password\n");
     } else {

