AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-14 12:41:07 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'fix-selection-input-stream-leak' into 'main'

Browse Source 
gtkselectioninputstream-x11: Do not leak the stream and double-free the EOF bytes marker

Closes #4892

See merge request GNOME/gtk!6037
This commit is contained in:
Matthias Clasen 2023-05-30 19:10:49 +00:00
commit f5e7a1d4cc
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
gdk/x11/gdkselectioninputstream-x11.c
View File

@ -89,7 +89,7 @@ gdk_x11_selection_input_stream_fill_buffer (GdkX11SelectionInputStream *stream,
if (size == 0) if (size == 0)
{ {
/* EOF marker, put it back */ /* EOF marker, put it back */
g_async_queue_push_front_unlocked (priv->chunks, bytes); g_async_queue_push_front_unlocked (priv->chunks, g_steal_pointer (&bytes));
break; break;
} }
else if (size > count) else if (size > count)
@ -107,7 +107,7 @@ gdk_x11_selection_input_stream_fill_buffer (GdkX11SelectionInputStream *stream,
memcpy (buffer, g_bytes_get_data (bytes, NULL), size); memcpy (buffer, g_bytes_get_data (bytes, NULL), size);
} }
g_bytes_unref (bytes); g_bytes_unref (g_steal_pointer (&bytes));
result += size; result += size;
if (buffer) if (buffer)
buffer += size; buffer += size;
@ -165,9 +165,7 @@ gdk_x11_selection_input_stream_complete (GdkX11SelectionInputStream *stream)
GDK_X11_DISPLAY (priv->display)->streams = g_slist_remove (GDK_X11_DISPLAY (priv->display)->streams, stream); GDK_X11_DISPLAY (priv->display)->streams = g_slist_remove (GDK_X11_DISPLAY (priv->display)->streams, stream);
g_signal_handlers_disconnect_by_func (priv->display, g_signal_handlers_disconnect_by_func (priv->display,
gdk_x11_selection_input_stream_xevent, gdk_x11_selection_input_stream_xevent,
stream); g_steal_pointer (&stream));
g_object_unref (stream);
} }
static gssize static gssize
@ -416,7 +414,7 @@ gdk_x11_selection_input_stream_xevent (GdkDisplay *display,
"%s:%s: got PropertyNotify erroring out of INCR", "%s:%s: got PropertyNotify erroring out of INCR",
priv->selection, priv->target); priv->selection, priv->target);
/* error, should we signal one? */ /* error, should we signal one? */
gdk_x11_selection_input_stream_complete (stream); g_clear_pointer (&stream, gdk_x11_selection_input_stream_complete);
} }
else if (g_bytes_get_size (bytes) == 0 || type == None) else if (g_bytes_get_size (bytes) == 0 || type == None)
{ {
@ -424,7 +422,7 @@ gdk_x11_selection_input_stream_xevent (GdkDisplay *display,
"%s:%s: got PropertyNotify ending INCR", "%s:%s: got PropertyNotify ending INCR",
priv->selection, priv->target); priv->selection, priv->target);
g_bytes_unref (bytes); g_bytes_unref (bytes);
gdk_x11_selection_input_stream_complete (stream); g_clear_pointer (&stream, gdk_x11_selection_input_stream_complete);
} }
else else
{ {
@ -467,7 +465,7 @@ gdk_x11_selection_input_stream_xevent (GdkDisplay *display,
G_IO_ERROR, G_IO_ERROR,
G_IO_ERROR_NOT_FOUND, G_IO_ERROR_NOT_FOUND,
_("Format %s not supported"), priv->target); _("Format %s not supported"), priv->target);
gdk_x11_selection_input_stream_complete (stream); g_clear_pointer (&stream, gdk_x11_selection_input_stream_complete);
} }
else else
{ {
@ -478,7 +476,7 @@ gdk_x11_selection_input_stream_xevent (GdkDisplay *display,
if (bytes == NULL) if (bytes == NULL)
{ {
gdk_x11_selection_input_stream_complete (stream); g_clear_pointer (&stream, gdk_x11_selection_input_stream_complete);
} }
else else
{ {
@ -500,7 +498,7 @@ gdk_x11_selection_input_stream_xevent (GdkDisplay *display,
g_bytes_get_size (bytes)); g_bytes_get_size (bytes));
g_async_queue_push (priv->chunks, bytes); g_async_queue_push (priv->chunks, bytes);
gdk_x11_selection_input_stream_complete (stream); g_clear_pointer (&stream, gdk_x11_selection_input_stream_complete);
} }
} }
@ -541,7 +539,10 @@ gdk_x11_selection_input_stream_new_async (GdkDisplay *display,
priv->property = g_strdup_printf ("GDK_SELECTION_%p", stream); priv->property = g_strdup_printf ("GDK_SELECTION_%p", stream);
priv->xproperty = gdk_x11_get_xatom_by_name_for_display (display, priv->property); priv->xproperty = gdk_x11_get_xatom_by_name_for_display (display, priv->property);
g_signal_connect (display, "xevent", G_CALLBACK (gdk_x11_selection_input_stream_xevent), stream); g_signal_connect_data (display, "xevent",
G_CALLBACK (gdk_x11_selection_input_stream_xevent),
g_steal_pointer (&stream),
(GClosureNotify) g_object_unref, 0);
XConvertSelection (GDK_DISPLAY_XDISPLAY (display), XConvertSelection (GDK_DISPLAY_XDISPLAY (display),
priv->xselection, priv->xselection,
@ -577,7 +578,6 @@ gdk_x11_selection_input_stream_new_finish (GAsyncResult *result,
*type = priv->type; *type = priv->type;
if (format) if (format)
*format = priv->format; *format = priv->format;
g_object_ref (stream);
} }
return G_INPUT_STREAM (stream); return G_INPUT_STREAM (stream);