From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1LWXR3-0004yY-4I
	for qemu-devel@nongnu.org; Mon, 09 Feb 2009 09:48:33 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1LWXQz-0004xS-Vb
	for qemu-devel@nongnu.org; Mon, 09 Feb 2009 09:48:31 -0500
Received: from [199.232.76.173] (port=42079 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1LWXQz-0004xM-Hh
	for qemu-devel@nongnu.org; Mon, 09 Feb 2009 09:48:29 -0500
Received: from e3.ny.us.ibm.com ([32.97.182.143]:34477)
	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 1LWXQz-0006QR-5w
	for qemu-devel@nongnu.org; Mon, 09 Feb 2009 09:48:29 -0500
Received: from d01relay04.pok.ibm.com (d01relay04.pok.ibm.com [9.56.227.236])
	by e3.ny.us.ibm.com (8.13.1/8.13.1) with ESMTP id n19EkMAW000920
	for <qemu-devel@nongnu.org>; Mon, 9 Feb 2009 09:46:22 -0500
Received: from d01av02.pok.ibm.com (d01av02.pok.ibm.com [9.56.224.216])
	by d01relay04.pok.ibm.com (8.13.8/8.13.8/NCO v9.1) with ESMTP id
	n19EmSPr177316
	for <qemu-devel@nongnu.org>; Mon, 9 Feb 2009 09:48:28 -0500
Received: from d01av02.pok.ibm.com (loopback [127.0.0.1])
	by d01av02.pok.ibm.com (8.12.11.20060308/8.13.3) with ESMTP id
	n19ElNF4020978
	for <qemu-devel@nongnu.org>; Mon, 9 Feb 2009 09:47:23 -0500
Received: from squirrel.codemonkey.ws (sig-9-65-207-138.mts.ibm.com
	[9.65.207.138])
	by d01av02.pok.ibm.com (8.12.11.20060308/8.12.11) with ESMTP id
	n19ElMQl020875
	for <qemu-devel@nongnu.org>; Mon, 9 Feb 2009 09:47:22 -0500
Message-ID: <49904225.5060808@us.ibm.com>
Date: Mon, 09 Feb 2009 08:48:05 -0600
From: Anthony Liguori <aliguori@us.ibm.com>
MIME-Version: 1.0
Subject: Re: [Qemu-devel] [PATCH 05/17] monitor: Don't change VNC server when
	disabled
References: <20090207181627.13667.9979.stgit@mchn012c.ww002.siemens.net>
	<20090207181628.13667.27538.stgit@mchn012c.ww002.siemens.net>
In-Reply-To: <20090207181628.13667.27538.stgit@mchn012c.ww002.siemens.net>
Content-Type: text/plain; charset=UTF-8; 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

Jan Kiszka wrote:
> Avoid a segfault when the user issues 'change vnc' without having vnc
> enabled on startup.
>
> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
>   

It'd be easier on me if you split out these sort of fixes from the rest 
of the series (that clearly has nothing to do with improving the monitor).

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