From b310a2a6095ec927a42cc1aba520a316be0faf51 Mon Sep 17 00:00:00 2001 From: Fam Zheng Date: Fri, 21 Nov 2014 09:59:09 +0800 Subject: [PATCH] gtk: Don't crash if -nodefaults This fixes a crash by just skipping the vte resize hack if cur is NULL. Reproducer: qemu-system-x86_64 -nodefaults Signed-off-by: Fam Zheng Signed-off-by: Gerd Hoffmann --- ui/gtk.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/ui/gtk.c b/ui/gtk.c index 9496b8d24f..0385757bf5 100644 --- a/ui/gtk.c +++ b/ui/gtk.c @@ -1909,15 +1909,17 @@ void gtk_display_init(DisplayState *ds, bool full_screen, bool grab_on_hover) #ifdef VTE_RESIZE_HACK { VirtualConsole *cur = gd_vc_find_current(s); - int i; + if (cur) { + int i; - for (i = 0; i < s->nb_vcs; i++) { - VirtualConsole *vc = &s->vc[i]; - if (vc && vc->type == GD_VC_VTE && vc != cur) { - gtk_widget_hide(vc->vte.terminal); + for (i = 0; i < s->nb_vcs; i++) { + VirtualConsole *vc = &s->vc[i]; + if (vc && vc->type == GD_VC_VTE && vc != cur) { + gtk_widget_hide(vc->vte.terminal); + } } + gd_update_windowsize(cur); } - gd_update_windowsize(cur); } #endif