From: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
Date: Mon, 20 Sep 2010 13:11:19 +0000 (+0100)
Subject: console: Avoid dereferencing NULL active_console
X-Git-Tag: v0.14.0-rc0~600
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=358664cc6d1b5f7c36004be0179b36011b81c49d;p=thirdparty%2Fqemu.git

console: Avoid dereferencing NULL active_console

The console_select() function does not check that active_console is
non-NULL before dereferencing it.  When invoked with qemu -nodefaults it
is possible to hit this case.

This patch checks that active_console is non-NULL before stashing away
the old console dimensions in console_select().

Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
Acked-by: Gerd Hoffmann <kraxel@redhat.com>
Acked-by: Stefan Weil <weil@mail.berlios.de>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
---

diff --git a/console.c b/console.c
index 698bc10a60c..c1728b1e040 100644
--- a/console.c
+++ b/console.c
@@ -1060,8 +1060,10 @@ void console_select(unsigned int index)
 
     if (index >= MAX_CONSOLES)
         return;
-    active_console->g_width = ds_get_width(active_console->ds);
-    active_console->g_height = ds_get_height(active_console->ds);
+    if (active_console) {
+        active_console->g_width = ds_get_width(active_console->ds);
+        active_console->g_height = ds_get_height(active_console->ds);
+    }
     s = consoles[index];
     if (s) {
         DisplayState *ds = s->ds;