callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wayland: Avoid a crash

Browse Source 
We can end up in situations where NULL gets passed to
get_transient_parent(). Embrace it instead of avoiding it.

https://bugzilla.gnome.org/show_bug.cgi?id=758327
This commit is contained in:
Matthias Clasen
2015-11-19 14:39:42 -05:00
parent 029aad7907
commit 12a692ea9d
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
gdk/wayland/gdkwindow-wayland.c
View File

@ -1274,7 +1274,7 @@ should_map_as_popup (GdkWindow *window)
static GdkWindow * static GdkWindow *
get_popup_parent (GdkWindow *window) get_popup_parent (GdkWindow *window)
{ {
do while (window)
{ {
GdkWindowImplWayland *impl = GDK_WINDOW_IMPL_WAYLAND (window->impl); GdkWindowImplWayland *impl = GDK_WINDOW_IMPL_WAYLAND (window->impl);
@ -1283,7 +1283,6 @@ get_popup_parent (GdkWindow *window)
window = impl->transient_for; window = impl->transient_for;
} }
while (window);
return NULL; return NULL;
} }
@ -1351,9 +1350,7 @@ gdk_wayland_window_map (GdkWindow *window)
} }
if (transient_for) if (transient_for)
transient_for = gdk_window_get_toplevel (transient_for); transient_for = get_popup_parent (gdk_window_get_toplevel (transient_for));
if (transient_for)
transient_for = get_popup_parent (transient_for);
/* If the position was not explicitly set, start the popup at the /* If the position was not explicitly set, start the popup at the
* position of the device that holds the grab. * position of the device that holds the grab.