diff options
| author | Luiz Capitulino <lcapitulino@redhat.com> | 2009-12-14 18:53:24 -0200 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2009-12-18 11:26:27 -0600 |
| commit | 2daa11912699d9412fb4404d646031a74b166aa5 (patch) | |
| tree | 6094feb647f04bba7831d6006f70a0dfb2a9fa92 | |
| parent | 183e6e525764d5c4978e37b42dc2cde0b0ffcfec (diff) | |
| download | focaccia-qemu-2daa11912699d9412fb4404d646031a74b166aa5.tar.gz focaccia-qemu-2daa11912699d9412fb4404d646031a74b166aa5.zip | |
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 <lcapitulino@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
| -rw-r--r-- | monitor.c | 6 |
1 files 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 { |