summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOndrej Holy <oholy@redhat.com>2018-02-16 10:22:57 +0100
committerOndrej Holy <oholy@redhat.com>2018-02-28 09:50:14 +0100
commit44ae775dfcdad92a89db8e86b7cec1415863723d (patch)
tree594132db2a04a463574d4c3e6cc1825d05fda608
parent79582faa18a333bcff8c3b446aeb2d9432ec3e55 (diff)
downloadgvfs-44ae775dfcdad92a89db8e86b7cec1415863723d.tar.gz
daemon: Add missing guards for job_sources
Use daemon->lock when accessing daemon->job_sources as on other places. This might potentially help to fix some segfaults. https://bugzilla.gnome.org/show_bug.cgi?id=787992
-rw-r--r--daemon/gvfsdaemon.c16
1 files changed, 12 insertions, 4 deletions
diff --git a/daemon/gvfsdaemon.c b/daemon/gvfsdaemon.c
index b7a3b885..8305700f 100644
--- a/daemon/gvfsdaemon.c
+++ b/daemon/gvfsdaemon.c
@@ -1069,6 +1069,8 @@ g_vfs_daemon_get_blocking_processes (GVfsDaemon *daemon)
GArray *processes;
GList *l;
+ g_mutex_lock (&daemon->lock);
+
processes = g_array_new (FALSE, FALSE, sizeof (GPid));
for (l = daemon->job_sources; l != NULL; l = l->next)
{
@@ -1080,6 +1082,8 @@ g_vfs_daemon_get_blocking_processes (GVfsDaemon *daemon)
}
}
+ g_mutex_unlock (&daemon->lock);
+
return processes;
}
@@ -1124,8 +1128,12 @@ g_vfs_daemon_close_active_channels (GVfsDaemon *daemon,
{
GList *l;
- for (l = daemon->job_sources; l != NULL; l = l->next)
- if (G_VFS_IS_CHANNEL (l->data) &&
- g_vfs_channel_get_backend (G_VFS_CHANNEL (l->data)) == backend)
- g_vfs_channel_force_close (G_VFS_CHANNEL (l->data));
+ g_mutex_lock (&daemon->lock);
+
+ for (l = daemon->job_sources; l != NULL; l = l->next)
+ if (G_VFS_IS_CHANNEL (l->data) &&
+ g_vfs_channel_get_backend (G_VFS_CHANNEL (l->data)) == backend)
+ g_vfs_channel_force_close (G_VFS_CHANNEL (l->data));
+
+ g_mutex_unlock (&daemon->lock);
}