isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-25 09:30:45 -05:00
Code Issues Packages Projects Releases Wiki Activity

xwayland: Protect against crash on x11->wayland transfer cancellation

Browse Source 
If the transfer is cancelled, the X11SelectionData will be cleared from
the MetaSelectionBridge, although x11_data_write_cb() was invariably
expecting it to be non-NULL.

If the write was cancelled, all the actions done in x11_data_write_cb()
are moot, so just return early. If there's other errors happening
(eg. "connection closed" if the target client happens to crash), we
should still attempt at clearing the data anyway.

https://bugzilla.gnome.org/show_bug.cgi?id=754357
This commit is contained in:
Carlos Garnacho 2015-09-11 15:35:07 +02:00
parent 8b0b0cf028
commit da0aac665f
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/wayland/meta-xwayland-selection.c
View File

@ -410,27 +410,33 @@ x11_data_write_cb (GObject *object,
MetaSelectionBridge *selection = user_data; MetaSelectionBridge *selection = user_data;
X11SelectionData *data = selection->x11_selection; X11SelectionData *data = selection->x11_selection;
GError *error = NULL; GError *error = NULL;
gboolean success = TRUE;
g_output_stream_write_finish (G_OUTPUT_STREAM (object), res, &error); g_output_stream_write_finish (G_OUTPUT_STREAM (object), res, &error);
if (data->incr) if (error)
{
if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
{
g_error_free (error);
return;
}
g_warning ("Error writing from X11 selection: %s\n", error->message);
g_error_free (error);
success = FALSE;
}
if (success && data->incr)
{ {
Display *xdisplay = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()); Display *xdisplay = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
XDeleteProperty (xdisplay, selection->window, XDeleteProperty (xdisplay, selection->window,
gdk_x11_get_xatom_by_name ("_META_SELECTION")); gdk_x11_get_xatom_by_name ("_META_SELECTION"));
} }
else
if (error)
{ {
if (error->domain != G_IO_ERROR || x11_selection_data_finish (selection, success);
error->code != G_IO_ERROR_CANCELLED)
g_warning ("Error writing from X11 selection: %s\n", error->message);
g_error_free (error);
} }
if (!data->incr)
x11_selection_data_finish (selection, TRUE);
} }
static void static void