From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stefano Stabellini Subject: [PATCH] fix domid length in xenconsole Date: Tue, 16 Jun 2009 16:44:22 +0100 Message-ID: <4A37BDD6.2050505@eu.citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit Return-path: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: xen-devel List-Id: xen-devel@lists.xenproject.org Hi all, the last patch for xenconsole erroneously assumed that the max length of a domid in char is 3 while is obviously 5; this patch fixes it. Also snprintf includes the final '\0' in the char count. Signed-off-by: Stefano Stabellini --- diff -r 33894148c1fd tools/console/client/main.c --- a/tools/console/client/main.c Tue Jun 16 13:42:22 2009 +0100 +++ b/tools/console/client/main.c Tue Jun 16 13:45:18 2009 +0100 @@ -306,10 +306,10 @@ dom_path = xs_get_domain_path(xs, domid); if (dom_path == NULL) err(errno, "xs_get_domain_path()"); - path = malloc(strlen(dom_path) + strlen("/serial/0/tty") + 3); + path = malloc(strlen(dom_path) + strlen("/serial/0/tty") + 5); if (path == NULL) err(ENOMEM, "malloc"); - snprintf(path, strlen(dom_path) + strlen("/serial/0/tty") + 2, "%s/serial/%d/tty", dom_path, num); + snprintf(path, strlen(dom_path) + strlen("/serial/0/tty") + 5, "%s/serial/%d/tty", dom_path, num); /* FIXME consoled currently does not assume domain-0 doesn't have a console which is good when we break domain-0 up. To keep us