From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NKHva-0002OC-5p for qemu-devel@nongnu.org; Mon, 14 Dec 2009 15:53:58 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NKHvU-0002Jq-Uq for qemu-devel@nongnu.org; Mon, 14 Dec 2009 15:53:57 -0500 Received: from [199.232.76.173] (port=39720 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NKHvU-0002Ja-JB for qemu-devel@nongnu.org; Mon, 14 Dec 2009 15:53:52 -0500 Received: from mx1.redhat.com ([209.132.183.28]:1712) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NKHvT-0002fh-Mx for qemu-devel@nongnu.org; Mon, 14 Dec 2009 15:53:52 -0500 From: Luiz Capitulino Date: Mon, 14 Dec 2009 18:53:24 -0200 Message-Id: <1260824004-2941-6-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1260824004-2941-1-git-send-email-lcapitulino@redhat.com> References: <1260824004-2941-1-git-send-email-lcapitulino@redhat.com> Subject: [Qemu-devel] [PATCH 5/5] monitor: Catch printing to non-existent monitor List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aliguori@us.ibm.com The monitor_vprintf() function now touches the 'mon' pointer before calling monitor_puts(), this causes block migration to segfault as its functions call monitor_printf() with a NULL 'mon'. To fix the problem this commit moves the 'mon' NULL check from monitor_puts() to monitor_vprintf(). This can potentially hide bugs, but for some reason this has been the behavior for a long time. Signed-off-by: Luiz Capitulino --- monitor.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/monitor.c b/monitor.c index b518cc4..ebd0282 100644 --- a/monitor.c +++ b/monitor.c @@ -177,9 +177,6 @@ static void monitor_puts(Monitor *mon, const char *str) { char c; - if (!mon) - return; - for(;;) { c = *str++; if (c == '\0') @@ -195,6 +192,9 @@ static void monitor_puts(Monitor *mon, const char *str) void monitor_vprintf(Monitor *mon, const char *fmt, va_list ap) { + if (!mon) + return; + if (mon->mc && !mon->mc->print_enabled) { qemu_error_new(QERR_UNDEFINED_ERROR); } else { -- 1.6.6.rc2.5.g49666