[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 01/11] ui/gtk: fix crash at startup when no consol
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PULL v2 01/11] ui/gtk: fix crash at startup when no console is available |
Date: |
Mon, 9 Jan 2017 14:09:35 +0100 |
From: Hervé Poussineau <address@hidden>
This patch fixes a segfault at QEMU startup, introduced in
a08156321ab9a7d2fed9ee77dbfeea2a61ffd153.
gd_vc_find_current() return NULL, which is dereferenced without checking it.
While at it, disable the whole 'View' menu if no console exists.
Reproducer: qemu-system-i386 -M none -nodefaults
Signed-off-by: Hervé Poussineau <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>
---
ui/gtk.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/ui/gtk.c b/ui/gtk.c
index a216216..406de4f 100644
--- a/ui/gtk.c
+++ b/ui/gtk.c
@@ -2171,6 +2171,8 @@ static gboolean gtkinit;
void gtk_display_init(DisplayState *ds, bool full_screen, bool grab_on_hover)
{
+ VirtualConsole *vc;
+
GtkDisplayState *s = g_malloc0(sizeof(*s));
char *filename;
GdkDisplay *window_display;
@@ -2249,9 +2251,11 @@ void gtk_display_init(DisplayState *ds, bool
full_screen, bool grab_on_hover)
}
#endif
+ vc = gd_vc_find_current(s);
+ gtk_widget_set_sensitive(s->view_menu, vc != NULL);
#ifdef CONFIG_VTE
gtk_widget_set_sensitive(s->copy_item,
- gd_vc_find_current(s)->type == GD_VC_VTE);
+ vc && vc->type == GD_VC_VTE);
#endif
if (full_screen) {
--
1.8.3.1
- [Qemu-devel] [PULL v2 00/11] ui patch queue, Gerd Hoffmann, 2017/01/09
- [Qemu-devel] [PULL v2 03/11] console: add API to get underlying gui window ID, Gerd Hoffmann, 2017/01/09
- [Qemu-devel] [PULL v2 01/11] ui/gtk: fix crash at startup when no console is available,
Gerd Hoffmann <=
- [Qemu-devel] [PULL v2 08/11] ui: drop unused MOUSE_EVENT_WHEEL{UP, DN} defines, Gerd Hoffmann, 2017/01/09
- [Qemu-devel] [PULL v2 10/11] curses: Fix compiler warnings (Mingw-w64 redefinition of macro KEY_EVENT), Gerd Hoffmann, 2017/01/09
- [Qemu-devel] [PULL v2 02/11] ui: use evdev keymap when running under wayland, Gerd Hoffmann, 2017/01/09
- [Qemu-devel] [PULL v2 07/11] gtk: avoid oob array access, Gerd Hoffmann, 2017/01/09
- [Qemu-devel] [PULL v2 06/11] egl-helpers: Change file licensing to LGPLv2, Gerd Hoffmann, 2017/01/09
- [Qemu-devel] [PULL v2 11/11] ps2: Fix lost scancodes by recent changes, Gerd Hoffmann, 2017/01/09
- [Qemu-devel] [PULL v2 04/11] console: move window ID code from baum to sdl, Gerd Hoffmann, 2017/01/09
- [Qemu-devel] [PULL v2 05/11] sdl2: set window ID, Gerd Hoffmann, 2017/01/09