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

x11: Do not trust there is task in error paths

Browse Source 
Flushing the X11 selection output stream may happen synchronously or
implicitly, in which case there is not a task to complete. Check there
is actually a task before returning errors. We additionally set the
pipe_error flag, so future operations will fail with an error, albeit
with a more generic message.

https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1198

(cherry picked from commit 1909977a6787d6e06d4931df158b821f6fb35ad1)
This commit is contained in:
Carlos Garnacho 2020-04-15 10:46:34 +02:00 committed by Robert Mader
parent 8f64b3dcad
commit ebfe5e44c2
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/x11/meta-x11-selection-output-stream.c
View File

@ -286,6 +286,8 @@ meta_x11_selection_output_stream_perform_flush (MetaX11SelectionOutputStream *st
priv->delete_pending = FALSE; priv->delete_pending = FALSE;
priv->pipe_error = TRUE; priv->pipe_error = TRUE;
if (priv->pending_task)
{
XGetErrorText (xdisplay, error_code, error_str, sizeof (error_str)); XGetErrorText (xdisplay, error_code, error_str, sizeof (error_str));
g_task_return_new_error (priv->pending_task, g_task_return_new_error (priv->pending_task,
G_IO_ERROR, G_IO_ERROR,
@ -294,6 +296,7 @@ meta_x11_selection_output_stream_perform_flush (MetaX11SelectionOutputStream *st
error_str); error_str);
g_clear_object (&priv->pending_task); g_clear_object (&priv->pending_task);
} }
}
else if (priv->pending_task && priv->data->len == 0 && !priv->delete_pending) else if (priv->pending_task && priv->data->len == 0 && !priv->delete_pending)
{ {
size_t result; size_t result;