From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 7CE65C79F9E for ; Mon, 7 Sep 2026 20:18:29 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x3fmr-0002Gg-9I; Mon, 07 Sep 2026 16:17:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x3fmo-0002GC-LS for qemu-devel@nongnu.org; Mon, 07 Sep 2026 16:17:50 -0400 Received: from mgamail.intel.com ([198.175.65.19]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x3fml-0002qS-Az for qemu-devel@nongnu.org; Mon, 07 Sep 2026 16:17:50 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1788812267; x=1820348267; h=from:to:subject:date:message-id:mime-version: content-transfer-encoding; bh=BNemfLERoEk5gQhOcs3mrRBvSHtwxcHn87Wk0o1noLE=; b=nxN42fUlBczA4sk+DsWlJIStuvNm/hYQ49mxVRmYrJo0TSHXV9V4v1Z5 lzp1Pul71cK41HHn1IuJhC7fcbUYYivgm3iH2IxjqEtoKpBUeoc8IVHPL UpKms24dVv7M2gwskTV29YGdMn3LCKhJzJ5fwaAnHwZU9LY6HkMWM6Bf5 MzggBL+FvSrFLZH/RL1j8JboCESqlGmunubV0dQgf5jqVQ9CiDM6xnV/E zL7MfzXnqvobItHoBS7VUFkP9J8GIh3gBBzBxnP7fmP9xbhGcAEfmWVSX lNTsFzCSrIz4lEHc7i3GSpWNwpT8NWvUkZusCRQDtVWnwAQIQz5kNqh1i g==; X-CSE-ConnectionGUID: /KUWRNo9T7O1Rc04tg2xcw== X-CSE-MsgGUID: WKxNsIpoTWqh5VAD+1TNGA== X-IronPort-AV: E=McAfee;i="6800,10657,11899"; a="89141269" X-IronPort-AV: E=Sophos;i="6.25,267,1779174000"; d="scan'208";a="89141269" Received: from orviesa008.jf.intel.com ([10.64.159.148]) by orvoesa111.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Sep 2026 13:17:42 -0700 X-CSE-ConnectionGUID: FRMkIt3+QqK7f44NsQMNUg== X-CSE-MsgGUID: ali4T4efQe2ki9IoF1lLNw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.25,267,1779174000"; d="scan'208";a="270273956" Received: from dongwonk-z390-aorus-ultra.fm.intel.com ([10.105.158.5]) by orviesa008.jf.intel.com with ESMTP; 07 Sep 2026 13:17:42 -0700 From: dongwon.kim@intel.com To: qemu-devel@nongnu.org Subject: [PATCH] ui/gtk: Handle empty notebook state in menu handlers Date: Mon, 7 Sep 2026 13:17:24 -0700 Message-Id: <20260907201724.523270-1-dongwon.kim@intel.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=198.175.65.19; envelope-from=dongwon.kim@intel.com; helo=mgamail.intel.com X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org From: Dongwon Kim When the GTK notebook has no active page (e.g. before pages are added or if all pages are detached/removed), gtk_notebook_get_current_page() returns -1. Previously, this value was passed unchecked to gd_vc_find_by_page(), which could result in unexpected lookups or NULL dereferences. Update gd_vc_find_current() to explicitly return NULL when page < 0. Additionally, add NULL checks for the current VirtualConsole across all relevant UI menu callbacks to avoid dereferencing an invalid or NULL pointer when no console tab is currently focused. Cc: Daniel P. Berrangé Cc: Marc-André Lureau Signed-off-by: Dongwon Kim --- ui/gtk.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 50 insertions(+), 6 deletions(-) diff --git a/ui/gtk.c b/ui/gtk.c index 7078d89d67..0b5139ef31 100644 --- a/ui/gtk.c +++ b/ui/gtk.c @@ -184,6 +184,11 @@ static VirtualConsole *gd_vc_find_current(GtkDisplayState *s) gint page; page = gtk_notebook_get_current_page(GTK_NOTEBOOK(s->notebook)); + + if (page < 0) { + return NULL; + } + return gd_vc_find_by_page(s, page); } @@ -1462,7 +1467,10 @@ static void gd_menu_show_tabs(GtkMenuItem *item, void *opaque) } else { gtk_notebook_set_show_tabs(GTK_NOTEBOOK(s->notebook), FALSE); } - gd_update_windowsize(vc); + + if (vc) { + gd_update_windowsize(vc); + } } static int gd_vc_notebook_pos(GtkDisplayState *s, VirtualConsole *target) @@ -1535,6 +1543,10 @@ static void gd_menu_untabify(GtkMenuItem *item, void *opaque) GtkDisplayState *s = opaque; VirtualConsole *vc = gd_vc_find_current(s); + if (!vc) { + return; + } + if (vc->type == GD_VC_GFX && qemu_console_is_graphic(vc->gfx.dcl.con)) { gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(s->grab_item), @@ -1588,7 +1600,10 @@ static void gd_menu_show_menubar(GtkMenuItem *item, void *opaque) } else { gtk_widget_hide(s->menu_bar); } - gd_update_windowsize(vc); + + if (vc) { + gd_update_windowsize(vc); + } } static void gd_accel_show_menubar(void *opaque) @@ -1605,7 +1620,7 @@ static void gd_menu_full_screen(GtkMenuItem *item, void *opaque) if (!s->full_screen) { gtk_notebook_set_show_tabs(GTK_NOTEBOOK(s->notebook), FALSE); gtk_widget_hide(s->menu_bar); - if (vc->type == GD_VC_GFX) { + if (vc && vc->type == GD_VC_GFX) { gtk_widget_set_size_request(vc->gfx.drawing_area, -1, -1); } gtk_window_fullscreen(GTK_WINDOW(s->window)); @@ -1618,14 +1633,16 @@ static void gd_menu_full_screen(GtkMenuItem *item, void *opaque) gtk_widget_show(s->menu_bar); } s->full_screen = FALSE; - if (vc->type == GD_VC_GFX) { + if (vc && vc->type == GD_VC_GFX) { vc->gfx.scale_x = vc->gfx.preferred_scale; vc->gfx.scale_y = vc->gfx.preferred_scale; gd_update_windowsize(vc); } } - gd_update_cursor(vc); + if (vc) { + gd_update_cursor(vc); + } } static void gd_accel_full_screen(void *opaque) @@ -1639,6 +1656,10 @@ static void gd_menu_zoom_in(GtkMenuItem *item, void *opaque) GtkDisplayState *s = opaque; VirtualConsole *vc = gd_vc_find_current(s); + if (!vc) { + return; + } + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(s->zoom_fit_item), FALSE); @@ -1659,6 +1680,10 @@ static void gd_menu_zoom_out(GtkMenuItem *item, void *opaque) GtkDisplayState *s = opaque; VirtualConsole *vc = gd_vc_find_current(s); + if (!vc) { + return; + } + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(s->zoom_fit_item), FALSE); @@ -1676,6 +1701,10 @@ static void gd_menu_zoom_fixed(GtkMenuItem *item, void *opaque) GtkDisplayState *s = opaque; VirtualConsole *vc = gd_vc_find_current(s); + if (!vc) { + return; + } + vc->gfx.scale_x = vc->gfx.preferred_scale; vc->gfx.scale_y = vc->gfx.preferred_scale; @@ -1687,6 +1716,10 @@ static void gd_menu_zoom_fit(GtkMenuItem *item, void *opaque) GtkDisplayState *s = opaque; VirtualConsole *vc = gd_vc_find_current(s); + if (!vc) { + return; + } + if (gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(s->zoom_fit_item))) { s->free_scale = TRUE; } else { @@ -1800,6 +1833,11 @@ static void gd_menu_grab_input(GtkMenuItem *item, void *opaque) VirtualConsole *vc = gd_vc_find_current(s); if (gd_is_grab_active(s)) { + if (!vc) { + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(s->grab_item), + FALSE); + return; + } gd_grab_keyboard(vc, "user-request-main-window"); gd_grab_pointer(vc, "user-request-main-window"); } else { @@ -1807,7 +1845,9 @@ static void gd_menu_grab_input(GtkMenuItem *item, void *opaque) gd_ungrab_pointer(s); } - gd_update_cursor(vc); + if (vc) { + gd_update_cursor(vc); + } } static void gd_change_page(GtkNotebook *nb, gpointer arg1, guint arg2, @@ -1983,6 +2023,10 @@ static void gd_menu_copy(GtkMenuItem *item, void *opaque) GtkDisplayState *s = opaque; VirtualConsole *vc = gd_vc_find_current(s); + if (!vc) { + return; + } + #if VTE_CHECK_VERSION(0, 50, 0) vte_terminal_copy_clipboard_format(VTE_TERMINAL(vc->vte.terminal), VTE_FORMAT_TEXT); -- 2.43.0