From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44383) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XrkT3-0005FB-Lv for qemu-devel@nongnu.org; Fri, 21 Nov 2014 04:25:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XrkSw-0003D9-G4 for qemu-devel@nongnu.org; Fri, 21 Nov 2014 04:25:29 -0500 Received: from mx1.redhat.com ([209.132.183.28]:59710) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XrkSw-0003Cr-9U for qemu-devel@nongnu.org; Fri, 21 Nov 2014 04:25:22 -0500 From: Gerd Hoffmann Date: Fri, 21 Nov 2014 10:25:12 +0100 Message-Id: <1416561912-8877-3-git-send-email-kraxel@redhat.com> In-Reply-To: <1416561912-8877-1-git-send-email-kraxel@redhat.com> References: <1416561912-8877-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PULL for-2.2 2/2] gtk: Don't crash if -nodefaults List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Fam Zheng , Gerd Hoffmann , Anthony Liguori From: Fam Zheng 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 | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/ui/gtk.c b/ui/gtk.c index 9496b8d..0385757 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; - - 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); + 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); + } } + gd_update_windowsize(cur); } - gd_update_windowsize(cur); } #endif -- 1.8.3.1