From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1L0Kdm-0008SV-Kq
	for qemu-devel@nongnu.org; Wed, 12 Nov 2008 13:40:34 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1L0Kdl-0008Re-1P
	for qemu-devel@nongnu.org; Wed, 12 Nov 2008 13:40:34 -0500
Received: from [199.232.76.173] (port=59184 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1L0Kdk-0008RZ-U0
	for qemu-devel@nongnu.org; Wed, 12 Nov 2008 13:40:32 -0500
Received: from sj-iport-6.cisco.com ([171.71.176.117]:28091)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_ARCFOUR_SHA1:16)
	(Exim 4.60) (envelope-from <koj@cisco.com>) id 1L0Kdk-0001Xo-LN
	for qemu-devel@nongnu.org; Wed, 12 Nov 2008 13:40:32 -0500
Received: from sj-core-2.cisco.com (sj-core-2.cisco.com [171.71.177.254])
	by sj-dkim-2.cisco.com (8.12.11/8.12.11) with ESMTP id mACIcbDg024078
	for <qemu-devel@nongnu.org>; Wed, 12 Nov 2008 10:38:37 -0800
Received: from [10.19.61.117] (sjc-koj-8714.cisco.com [10.19.61.117])
	by sj-core-2.cisco.com (8.13.8/8.13.8) with ESMTP id mACIcb48010227
	for <qemu-devel@nongnu.org>; Wed, 12 Nov 2008 18:38:37 GMT
Message-ID: <491B22AC.6050907@cisco.com>
Date: Wed, 12 Nov 2008 10:38:36 -0800
From: James Ko <koj@cisco.com>
MIME-Version: 1.0
Subject: [Qemu-devel] [PATCH] Fix crash on 'info vnc' after 'change vnc none'
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
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

I propose the following patch to prevent crash in call to term_print_filename
with NULL vnc_state->display argument from do_info_vnc.

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

James

diff -aru a/qemu/vnc.c b/qemu/vnc.c
--- a/qemu/vnc.c  2008-08-21 17:46:40.000000000 -0700
+++ b/qemu/vnc.c  2008-11-06 14:31:51.000000000 -0800
@@ -180,7 +180,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: ");