From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1LBZfw-00010i-7N
	for qemu-devel@nongnu.org; Sat, 13 Dec 2008 13:57:16 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1LBZfu-00010W-Nn
	for qemu-devel@nongnu.org; Sat, 13 Dec 2008 13:57:14 -0500
Received: from [199.232.76.173] (port=39738 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1LBZfu-00010T-JP
	for qemu-devel@nongnu.org; Sat, 13 Dec 2008 13:57:14 -0500
Received: from savannah.gnu.org ([199.232.41.3]:47112 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 1LBZfu-0003YQ-9n
	for qemu-devel@nongnu.org; Sat, 13 Dec 2008 13:57:14 -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 1LBZft-0005jQ-JI
	for qemu-devel@nongnu.org; Sat, 13 Dec 2008 18:57:13 +0000
Received: from aurel32 by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <aurel32@savannah.gnu.org>) id 1LBZft-0005jM-8F
	for qemu-devel@nongnu.org; Sat, 13 Dec 2008 18:57:13 +0000
MIME-Version: 1.0
Errors-To: aurel32
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Aurelien Jarno <aurelien@aurel32.net>
Message-Id: <E1LBZft-0005jM-8F@cvs.savannah.gnu.org>
Date: Sat, 13 Dec 2008 18:57:13 +0000
Subject: [Qemu-devel] [6010] vnc: Fix crash on 'info vnc' after 'change vnc
	none'
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: 6010
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6010
Author:   aurel32
Date:     2008-12-13 18:57:12 +0000 (Sat, 13 Dec 2008)

Log Message:
-----------
vnc: Fix crash on 'info vnc' after 'change vnc none'

vnc_state->display is set to NULL after "change vnc none" but vnc_state itself
is still valid.

(James Ko)

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

Modified: trunk/vnc.c
===================================================================
--- trunk/vnc.c	2008-12-13 15:51:14 UTC (rev 6009)
+++ trunk/vnc.c	2008-12-13 18:57:12 UTC (rev 6010)
@@ -183,7 +183,7 @@
 
 void do_info_vnc(void)
 {
-    if (vnc_state == NULL)
+    if (vnc_state == NULL || vnc_state->display == NULL)
 	term_printf("VNC server disabled\n");
     else {
 	term_printf("VNC server active on: ");