From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1LXME2-0001j4-0K
	for qemu-devel@nongnu.org; Wed, 11 Feb 2009 16:02:30 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1LXME0-0001is-Dh
	for qemu-devel@nongnu.org; Wed, 11 Feb 2009 16:02:29 -0500
Received: from [199.232.76.173] (port=52536 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1LXME0-0001in-84
	for qemu-devel@nongnu.org; Wed, 11 Feb 2009 16:02:28 -0500
Received: from e2.ny.us.ibm.com ([32.97.182.142]:56387)
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60)
	(envelope-from <aliguori@us.ibm.com>) id 1LXMDx-00044i-7i
	for qemu-devel@nongnu.org; Wed, 11 Feb 2009 16:02:25 -0500
Received: from d01relay02.pok.ibm.com (d01relay02.pok.ibm.com [9.56.227.234])
	by e2.ny.us.ibm.com (8.13.1/8.13.1) with ESMTP id n1BL0OEc011459
	for <qemu-devel@nongnu.org>; Wed, 11 Feb 2009 16:00:24 -0500
Received: from d01av04.pok.ibm.com (d01av04.pok.ibm.com [9.56.224.64])
	by d01relay02.pok.ibm.com (8.13.8/8.13.8/NCO v9.1) with ESMTP id
	n1BL2Onu194368
	for <qemu-devel@nongnu.org>; Wed, 11 Feb 2009 16:02:24 -0500
Received: from d01av04.pok.ibm.com (loopback [127.0.0.1])
	by d01av04.pok.ibm.com (8.12.11.20060308/8.13.3) with ESMTP id
	n1BL2OGx013015
	for <qemu-devel@nongnu.org>; Wed, 11 Feb 2009 16:02:24 -0500
Message-ID: <49933CC7.8030006@us.ibm.com>
Date: Wed, 11 Feb 2009 15:01:59 -0600
From: Anthony Liguori <aliguori@us.ibm.com>
MIME-Version: 1.0
References: <4991D1E9.4060009@siemens.com>
In-Reply-To: <4991D1E9.4060009@siemens.com>
Content-Type: text/plain; charset=ISO-8859-15; format=flowed
Content-Transfer-Encoding: 7bit
Subject: [Qemu-devel] Re: [PATCH] monitor: Don't change VNC server when
	disabled
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: Jan Kiszka <jan.kiszka@siemens.com>
Cc: qemu-devel <qemu-devel@nongnu.org>

Jan Kiszka wrote:
> [ 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>
>   

Applied.  Thanks.

Regards,

Anthony Liguori

> ---
>
>  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;
>
>
>