aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Graf <agraf@suse.de>2011-11-18 16:41:59 +0100
committerAlexander Graf <agraf@suse.de>2012-01-12 18:30:50 +0100
commit986626efecae87af17a9d9726767501cb4687b8c (patch)
tree4c83b997ad2c32fcaba5d49e4a86d7f645287a81
parent85a4ca797dbe25f27df0a66aa4df1cab63245cd3 (diff)
console: Fix segfault on screendump without VGA adapter
When trying to create a screen dump without having any VGA adapter inside the guest, QEMU segfaults. This is because it's trying to switch back to the "previous" screen it was on before dumping the VGA screen. Unfortunately, in my case there simply is no previous screen so it accesses a NULL pointer. Fix it by checking if previous_active_console is actually available. This is 1.0 material. Signed-off-by: Alexander Graf <agraf@suse.de>
-rw-r--r--console.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/console.c b/console.c
index f6fe44195..ed6a653fd 100644
--- a/console.c
+++ b/console.c
@@ -186,7 +186,9 @@ void vga_hw_screen_dump(const char *filename)
consoles[0]->hw_screen_dump(consoles[0]->hw, filename);
}
- console_select(previous_active_console->index);
+ if (previous_active_console) {
+ console_select(previous_active_console->index);
+ }
}
void vga_hw_text_update(console_ch_t *chardata)