luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-04-01 21:33:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

glocalfilemonitor: Avoid a deadlock on finalization

Browse Source 
If `g_file_monitor_source_dispatch()` drops the last reference to its
`GLocalFileMonitor`, a deadlock will occur, because disposing the
`GLocalFileMonitor` causes synchronous disposal of the
`GFileMonitorSource`, and hence an attempt to re-lock the already-locked
mutex in the `GFileMonitorSource`.

Fix that by dropping the reference to the `GLocalFileMonitor` after
unlocking.

Diagnosed by Ting-Wei Lan. The bug was originally introduced by me in
commit 592a13b483.

Signed-off-by: Philip Withnall <pwithnall@endlessos.org>
This commit is contained in:
Philip Withnall 2021-06-14 15:02:59 +01:00
parent 8249f624ed
commit f49710b8aa
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gio/glocalfilemonitor.c
View File

@ -555,8 +555,8 @@ g_file_monitor_source_dispatch (GSource *source,
g_file_monitor_source_update_ready_time (fms); g_file_monitor_source_update_ready_time (fms);
g_clear_object (&instance);
g_mutex_unlock (&fms->lock); g_mutex_unlock (&fms->lock);
g_clear_object (&instance);
/* We now have our list of events to deliver */ /* We now have our list of events to deliver */
while ((event = g_queue_pop_head (&event_queue))) while ((event = g_queue_pop_head (&event_queue)))