From: Alon Levy <alevy@redhat.com>
Date: Tue, 4 Oct 2011 11:25:53 +0000 (+0200)
Subject: ui/spice-core: fix segfault in monitor
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=3bb781f3ed91bd3f085ded4d16f089e7b66f1076;p=qemu.git

ui/spice-core: fix segfault in monitor

Fix segfault if a qxl device is present but no spice command line
argument is given.

RHBZ 743251.

Signed-off-by: Alon Levy <alevy@redhat.com>
---

diff --git a/ui/spice-core.c b/ui/spice-core.c
index 4c06c36c31..be52356e63 100644
--- a/ui/spice-core.c
+++ b/ui/spice-core.c
@@ -445,7 +445,7 @@ void do_info_spice(Monitor *mon, QObject **ret_data)
     int port, tls_port;
     char version_string[20]; /* 12 = |255.255.255\0| is the max */
 
-    if (!spice_server) {
+    if (!spice_server || !opts) {
         *ret_data = qobject_from_jsonf("{ 'enabled': false }");
         return;
     }