From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LWy3S-0006Pp-S6 for qemu-devel@nongnu.org; Tue, 10 Feb 2009 14:13:58 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LWy3P-0006NI-W5 for qemu-devel@nongnu.org; Tue, 10 Feb 2009 14:13:58 -0500 Received: from [199.232.76.173] (port=44426 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LWy3P-0006N4-QL for qemu-devel@nongnu.org; Tue, 10 Feb 2009 14:13:55 -0500 Received: from lizzard.sbs.de ([194.138.37.39]:24546) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1LWy3P-0002rc-Bi for qemu-devel@nongnu.org; Tue, 10 Feb 2009 14:13:55 -0500 Message-ID: <4991D1E9.4060009@siemens.com> Date: Tue, 10 Feb 2009 20:13:45 +0100 From: Jan Kiszka MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] [PATCH] monitor: Don't change VNC server when disabled Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Anthony Liguori Cc: qemu-devel [ As requested, broken out of the monitor rework series. ] Avoid a segfault when the user issues 'change vnc' without having vnc enabled on startup. Signed-off-by: Jan Kiszka --- vnc.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/vnc.c b/vnc.c index 68df599..bdfc79b 100644 --- a/vnc.c +++ b/vnc.c @@ -2333,6 +2333,8 @@ void vnc_display_close(DisplayState *ds) { VncState *vs = ds ? (VncState *)ds->opaque : vnc_state; + if (!vs) + return; if (vs->display) { qemu_free(vs->display); vs->display = NULL; @@ -2392,6 +2394,8 @@ int vnc_display_open(DisplayState *ds, const char *display) int tls = 0, x509 = 0; #endif + if (!vnc_state) + return -1; vnc_display_close(ds); if (strcmp(display, "none") == 0) return 0;