isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-12-28 13:52:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

display: Deal with destroying windows in pointer rest callback

Browse Source 
Take a reference to the window to make sure the MetaFocusData->window
pointer is not pointing to a freed object.

Also make sure that the window that we want to focus is not currently
unmanaging.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3258>
This commit is contained in:
Sebastian Wick 2023-09-12 19:03:18 +02:00 committed by Marge Bot
parent 44fcf33156
commit 49d1af2023
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/core/display.c
View File

@ -3812,6 +3812,13 @@ typedef struct
int pointer_y; int pointer_y;
} MetaFocusData; } MetaFocusData;
static void
meta_focus_data_free (MetaFocusData *focus_data)
{
g_clear_object (&focus_data->window);
g_free (focus_data);
}
static void static void
focus_mouse_mode (MetaDisplay *display, focus_mouse_mode (MetaDisplay *display,
MetaWindow *window, MetaWindow *window,
@ -3866,6 +3873,9 @@ focus_on_pointer_rest_callback (gpointer data)
graphene_point_t point; graphene_point_t point;
uint32_t timestamp_ms; uint32_t timestamp_ms;
if (window && window->unmanaging)
goto out;
if (meta_prefs_get_focus_mode () == G_DESKTOP_FOCUS_MODE_CLICK) if (meta_prefs_get_focus_mode () == G_DESKTOP_FOCUS_MODE_CLICK)
goto out; goto out;
@ -3906,10 +3916,13 @@ queue_pointer_rest_callback (MetaDisplay *display,
focus_data = g_new (MetaFocusData, 1); focus_data = g_new (MetaFocusData, 1);
focus_data->display = display; focus_data->display = display;
focus_data->window = window; focus_data->window = NULL;
focus_data->pointer_x = pointer_x; focus_data->pointer_x = pointer_x;
focus_data->pointer_y = pointer_y; focus_data->pointer_y = pointer_y;
if (window)
focus_data->window = g_object_ref (window);
g_clear_handle_id (&display->focus_timeout_id, g_source_remove); g_clear_handle_id (&display->focus_timeout_id, g_source_remove);
display->focus_timeout_id = display->focus_timeout_id =
@ -3917,7 +3930,7 @@ queue_pointer_rest_callback (MetaDisplay *display,
FOCUS_TIMEOUT_DELAY, FOCUS_TIMEOUT_DELAY,
focus_on_pointer_rest_callback, focus_on_pointer_rest_callback,
focus_data, focus_data,
g_free); (GDestroyNotify) meta_focus_data_free);
g_source_set_name_by_id (display->focus_timeout_id, g_source_set_name_by_id (display->focus_timeout_id,
"[mutter] focus_on_pointer_rest_callback"); "[mutter] focus_on_pointer_rest_callback");
} }