AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-12-27 22:20:24 +00:00
Code Issues Projects Releases Wiki Activity

wayland/surface: Only call destroy func when available

Browse Source 
When calling gdk_wayland_surface_export_handle(), if we pass
some 'user_data' but no 'destroy_func', GTK4 crashes. That's
because in xdg_exported_handle() we are unconditionally calling
destroy_func -- even when it's NULL.

Fix that by checking if there's a destroy function before calling
it.

Fixes https://gitlab.gnome.org/GNOME/gtk/issues/2179
This commit is contained in:
Georges Basile Stavracas Neto 2019-10-01 11:54:28 -03:00
parent bcea96528a
commit 655c9dd526
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4063,8 +4063,11 @@ xdg_exported_handle (void *data,
GdkWaylandSurface *impl = GDK_WAYLAND_SURFACE (surface); GdkWaylandSurface *impl = GDK_WAYLAND_SURFACE (surface);
impl->exported.callback (surface, handle, impl->exported.user_data); impl->exported.callback (surface, handle, impl->exported.user_data);
g_clear_pointer (&impl->exported.user_data, if (impl->exported.destroy_func)
impl->exported.destroy_func); {
g_clear_pointer (&impl->exported.user_data,
impl->exported.destroy_func);
}
} }
static const struct zxdg_exported_v1_listener xdg_exported_listener = { static const struct zxdg_exported_v1_listener xdg_exported_listener = {