luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-09-05 23:48:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix a possible deadlock

Browse Source 
the FdSource was calling g_cancellable_disconnect while holding the
main context lock, which is bad news if the ::cancelled handler is
trying to get that lock to wake up the mainloop...

Bug 586432
This commit is contained in:
Matthias Clasen
2010-08-03 10:41:21 -04:00
parent 5179d92e9c
commit b2715bbc5e
2 changed files with 7 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gio/gasynchelper.c
View File

@@ -86,9 +86,13 @@ fd_source_finalize (GSource *source)
{
FDSource *fd_source = (FDSource *)source;
/* we don't use g_cancellable_disconnect() here, since we are holding
* the main context lock here, and the ::disconnect signal handler
* will try to grab that, and deadlock looms.
*/
if (fd_source->cancelled_tag)
g_cancellable_disconnect (fd_source->cancellable,
fd_source->cancelled_tag);
g_signal_handler_disconnect (fd_source->cancellable,
fd_source->cancelled_tag);
if (fd_source->cancellable)
g_object_unref (fd_source->cancellable);