From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1LXMCI-0000wN-Fq
	for qemu-devel@nongnu.org; Wed, 11 Feb 2009 16:00:42 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1LXMCH-0000vX-Iv
	for qemu-devel@nongnu.org; Wed, 11 Feb 2009 16:00:41 -0500
Received: from [199.232.76.173] (port=58262 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1LXMCH-0000vC-8x
	for qemu-devel@nongnu.org; Wed, 11 Feb 2009 16:00:41 -0500
Received: from savannah.gnu.org ([199.232.41.3]:52049 helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <INVALID.NOREPLY@gnu.org>)
	id 1LXMCG-0003wJ-O6
	for qemu-devel@nongnu.org; Wed, 11 Feb 2009 16:00:40 -0500
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1LXMCF-00071B-Dh
	for qemu-devel@nongnu.org; Wed, 11 Feb 2009 21:00:39 +0000
Received: from aliguori by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <aliguori@savannah.gnu.org>) id 1LXMCF-000715-0R
	for qemu-devel@nongnu.org; Wed, 11 Feb 2009 21:00:39 +0000
MIME-Version: 1.0
Errors-To: aliguori
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Anthony Liguori <anthony@codemonkey.ws>
Message-Id: <E1LXMCF-000715-0R@cvs.savannah.gnu.org>
Date: Wed, 11 Feb 2009 21:00:39 +0000
Subject: [Qemu-devel] [6616] monitor: Don't change VNC server when disabled
	(Jan Kiszka)
Reply-To: qemu-devel@nongnu.org
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org

Revision: 6616
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6616
Author:   aliguori
Date:     2009-02-11 21:00:38 +0000 (Wed, 11 Feb 2009)

Log Message:
-----------
monitor: Don't change VNC server when disabled (Jan Kiszka)

[ 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 <jan.kiszka@siemens.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

Modified Paths:
--------------
    trunk/vnc.c

Modified: trunk/vnc.c
===================================================================
--- trunk/vnc.c	2009-02-11 21:00:32 UTC (rev 6615)
+++ trunk/vnc.c	2009-02-11 21:00:38 UTC (rev 6616)
@@ -2333,6 +2333,8 @@
 {
     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 tls = 0, x509 = 0;
 #endif
 
+    if (!vnc_state)
+        return -1;
     vnc_display_close(ds);
     if (strcmp(display, "none") == 0)
 	return 0;