From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52355) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cOjdJ-0001hs-GV for qemu-devel@nongnu.org; Wed, 04 Jan 2017 06:21:30 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cOjdI-0001sy-KC for qemu-devel@nongnu.org; Wed, 04 Jan 2017 06:21:29 -0500 Received: from mx1.redhat.com ([209.132.183.28]:38552) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cOjdI-0001sS-EU for qemu-devel@nongnu.org; Wed, 04 Jan 2017 06:21:28 -0500 From: Gerd Hoffmann Date: Wed, 4 Jan 2017 12:21:13 +0100 Message-Id: <1483528883-1753-2-git-send-email-kraxel@redhat.com> In-Reply-To: <1483528883-1753-1-git-send-email-kraxel@redhat.com> References: <1483528883-1753-1-git-send-email-kraxel@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 01/11] ui/gtk: fix crash at startup when no console is available List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Gerd Hoffmann From: Herv=C3=A9 Poussineau This patch fixes a segfault at QEMU startup, introduced in a08156321ab9a7= d2fed9ee77dbfeea2a61ffd153. 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=C3=A9 Poussineau Reviewed-by: Stefan Hajnoczi Message-id: 1483263585-8101-1-git-send-email-hpoussin@reactos.org Signed-off-by: Gerd Hoffmann --- 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; =20 void gtk_display_init(DisplayState *ds, bool full_screen, bool grab_on_h= over) { + VirtualConsole *vc; + GtkDisplayState *s =3D 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 =20 + vc =3D gd_vc_find_current(s); + gtk_widget_set_sensitive(s->view_menu, vc !=3D NULL); #ifdef CONFIG_VTE gtk_widget_set_sensitive(s->copy_item, - gd_vc_find_current(s)->type =3D=3D GD_VC_VT= E); + vc && vc->type =3D=3D GD_VC_VTE); #endif =20 if (full_screen) { --=20 1.8.3.1