brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

core: Check X11 display availability before use in MetaStackTracker

Browse Source 
This object can be generally triggered without a X11 display, so make sure
this is alright. For guard window checks, use our internal
meta_stack_tracker_is_guard_window() call, which is already no-x11 aware.

https://gitlab.gnome.org/GNOME/mutter/merge_requests/730
This commit is contained in:
Carlos Garnacho 2019-08-16 00:27:03 +02:00 committed by Jonas Ådahl
parent 433e1b388d
commit 78232fa3eb
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/core/stack-tracker.c
View File

@ -924,8 +924,10 @@ meta_stack_tracker_sync_stack (MetaStackTracker *tracker)
if (META_STACK_ID_IS_X11 (window)) if (META_STACK_ID_IS_X11 (window))
{ {
MetaX11Display *x11_display = tracker->display->x11_display; MetaX11Display *x11_display = tracker->display->x11_display;
MetaWindow *meta_window = MetaWindow *meta_window = NULL;
meta_x11_display_lookup_x_window (x11_display, (Window)window);
if (x11_display)
meta_window = meta_x11_display_lookup_x_window (x11_display, (Window) window);
/* When mapping back from xwindow to MetaWindow we have to be a bit careful; /* When mapping back from xwindow to MetaWindow we have to be a bit careful;
* children of the root could include unmapped windows created by toolkits * children of the root could include unmapped windows created by toolkits
@ -1183,7 +1185,7 @@ meta_stack_tracker_restack_managed (MetaStackTracker *tracker,
{ {
MetaWindow *old_window = meta_display_lookup_stack_id (tracker->display, windows[old_pos]); MetaWindow *old_window = meta_display_lookup_stack_id (tracker->display, windows[old_pos]);
if ((old_window && !old_window->override_redirect && !old_window->unmanaging) || if ((old_window && !old_window->override_redirect && !old_window->unmanaging) ||
windows[old_pos] == tracker->display->x11_display->guard_window) meta_stack_tracker_is_guard_window (tracker, windows[old_pos]))
break; break;
} }
g_assert (old_pos >= 0); g_assert (old_pos >= 0);
@ -1202,7 +1204,7 @@ meta_stack_tracker_restack_managed (MetaStackTracker *tracker,
while (old_pos >= 0 && new_pos >= 0) while (old_pos >= 0 && new_pos >= 0)
{ {
if (windows[old_pos] == tracker->display->x11_display->guard_window) if (meta_stack_tracker_is_guard_window (tracker, windows[old_pos]))
break; break;
if (windows[old_pos] == managed[new_pos]) if (windows[old_pos] == managed[new_pos])