From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1LPiaV-0002hu-1W
	for qemu-devel@nongnu.org; Wed, 21 Jan 2009 14:18:07 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1LPiaU-0002h5-3O
	for qemu-devel@nongnu.org; Wed, 21 Jan 2009 14:18:06 -0500
Received: from [199.232.76.173] (port=57919 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1LPiaT-0002h0-Jm
	for qemu-devel@nongnu.org; Wed, 21 Jan 2009 14:18:05 -0500
Received: from savannah.gnu.org ([199.232.41.3]:43936 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 1LPiaT-000212-Bo
	for qemu-devel@nongnu.org; Wed, 21 Jan 2009 14:18:05 -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 1LPiaR-0005H0-R3
	for qemu-devel@nongnu.org; Wed, 21 Jan 2009 19:18:04 +0000
Received: from aliguori by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <aliguori@savannah.gnu.org>) id 1LPiaQ-0005GV-83
	for qemu-devel@nongnu.org; Wed, 21 Jan 2009 19:18:02 +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: <E1LPiaQ-0005GV-83@cvs.savannah.gnu.org>
Date: Wed, 21 Jan 2009 19:18:02 +0000
Subject: [Qemu-devel] [6390] re-fix screendump (Stefano Stabellini)
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: 6390
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6390
Author:   aliguori
Date:     2009-01-21 19:18:00 +0000 (Wed, 21 Jan 2009)

Log Message:
-----------
re-fix screendump (Stefano Stabellini)

Removing the assumption about a single graphic console made
get_graphic_console return NULL when called by vga_screen_dump.
In this case returning NULL is correct but since NULL is not handled in
qemu_console_resize it causes a segmentation fault.
Just returning immediately from qemu_console_resize is sufficient to fix the
problem.

Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

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

Modified: trunk/console.c
===================================================================
--- trunk/console.c	2009-01-21 18:59:12 UTC (rev 6389)
+++ trunk/console.c	2009-01-21 19:18:00 UTC (rev 6390)
@@ -1431,6 +1431,8 @@
 void qemu_console_resize(DisplayState *ds, int width, int height)
 {
     TextConsole *s = get_graphic_console(ds);
+    if (!s) return;
+
     s->g_width = width;
     s->g_height = height;
     if (is_graphic_console()) {