aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoraliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162>2009-01-21 19:18:00 +0000
committeraliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162>2009-01-21 19:18:00 +0000
commitf497f140d9fc947621d7e008ea0dc6b21c9e5642 (patch)
tree6dc47d81ffe8754c06055867796af74c30c48c36
parent68f00996405e899688e56249fd1e7c7810f67dbb (diff)
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> git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6390 c046a42c-6fe2-441c-8c8c-71466251a162
-rw-r--r--console.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/console.c b/console.c
index 4bc16e8d1b..dbb3b7010f 100644
--- a/console.c
+++ b/console.c
@@ -1431,6 +1431,8 @@ void text_consoles_set_display(DisplayState *ds)
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()) {