isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-02-28 02:34:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

wayland: Push an error trap while querying XDND mimetype list

Browse Source 
It is a possibility that this request results in an error, so handle the
possible fallout.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2745>
This commit is contained in:
Carlos Garnacho 2022-12-06 14:56:18 +01:00
parent a09b5ecd7a
commit 1cee0579fa
1 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/wayland/meta-xwayland-dnd.c
View File

@ -697,7 +697,9 @@ meta_xwayland_data_source_fetch_mimetype_list (MetaWaylandDataSource *source,
{ {
MetaWaylandDataSourceXWayland *source_xwayland = MetaWaylandDataSourceXWayland *source_xwayland =
META_WAYLAND_DATA_SOURCE_XWAYLAND (source); META_WAYLAND_DATA_SOURCE_XWAYLAND (source);
Display *xdisplay = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()); MetaXWaylandDnd *dnd = source_xwayland->dnd;
MetaX11Display *x11_display = x11_display_from_dnd (dnd);
Display *xdisplay = meta_x11_display_get_xdisplay (x11_display);
gulong nitems_ret, bytes_after_ret, i; gulong nitems_ret, bytes_after_ret, i;
Atom *atoms, type_ret, utf8_string; Atom *atoms, type_ret, utf8_string;
int format_ret; int format_ret;
@ -707,17 +709,26 @@ meta_xwayland_data_source_fetch_mimetype_list (MetaWaylandDataSource *source,
if (source_mime_types->size != 0) if (source_mime_types->size != 0)
return TRUE; return TRUE;
meta_x11_error_trap_push (x11_display);
utf8_string = gdk_x11_get_xatom_by_name ("UTF8_STRING"); utf8_string = gdk_x11_get_xatom_by_name ("UTF8_STRING");
XGetWindowProperty (xdisplay, window, prop, if (XGetWindowProperty (xdisplay, window, prop,
0, /* offset */ 0, /* offset */
0x1fffffff, /* length */ 0x1fffffff, /* length */
False, /* delete */ False, /* delete */
AnyPropertyType, AnyPropertyType,
&type_ret, &type_ret,
&format_ret, &format_ret,
&nitems_ret, &nitems_ret,
&bytes_after_ret, &bytes_after_ret,
(guchar **) &atoms); (guchar **) &atoms) != Success)
{
meta_x11_error_trap_pop (x11_display);
return FALSE;
}
if (meta_x11_error_trap_pop_with_return (x11_display) != Success)
return FALSE;
if (nitems_ret == 0 || type_ret != XA_ATOM) if (nitems_ret == 0 || type_ret != XA_ATOM)
{ {