From 2daa11912699d9412fb4404d646031a74b166aa5 Mon Sep 17 00:00:00 2001 From: Luiz Capitulino Date: Mon, 14 Dec 2009 18:53:24 -0200 Subject: [PATCH] monitor: Catch printing to non-existent monitor 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 Signed-off-by: Anthony Liguori --- monitor.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/monitor.c b/monitor.c index b518cc4b55..ebd0282ce4 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 {