summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilip Withnall <pwithnall@endlessos.org>2020-11-11 18:29:26 +0000
committerPhilip Withnall <pwithnall@endlessos.org>2020-11-20 14:40:19 +0000
commite4e88688a0722237effc56cc21438d0c8e82de88 (patch)
treeb97ac66b78efa552fed8bd4fd67fdf622cdfa2fc
parent74250cd9c9dfd3ad428e445c095ceac88ba18691 (diff)
downloadglib-e4e88688a0722237effc56cc21438d0c8e82de88.tar.gz
kqueue: Fix unlocked access to shared variable
And drop the `volatile` qualifier because it doesn’t help. Signed-off-by: Philip Withnall <pwithnall@endlessos.org> Helps: #600
-rw-r--r--gio/kqueue/kqueue-missing.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/gio/kqueue/kqueue-missing.c b/gio/kqueue/kqueue-missing.c
index 37af82e5b..d1ffdf4bd 100644
--- a/gio/kqueue/kqueue-missing.c
+++ b/gio/kqueue/kqueue-missing.c
@@ -34,7 +34,7 @@ static gboolean km_debug_enabled = FALSE;
static GSList *missing_subs_list = NULL;
G_LOCK_DEFINE_STATIC (missing_lock);
-static volatile gboolean scan_missing_running = FALSE;
+static gboolean scan_missing_running = FALSE; /* must be accessed under @missing_lock */
static gboolean
@@ -62,7 +62,6 @@ _km_add_missing (kqueue_sub *sub)
KM_W ("adding %s to missing list\n", sub->filename);
missing_subs_list = g_slist_prepend (missing_subs_list, sub);
- G_UNLOCK (missing_lock);
if (!scan_missing_running)
{
@@ -73,6 +72,8 @@ _km_add_missing (kqueue_sub *sub)
g_source_attach (source, GLIB_PRIVATE_CALL (g_get_worker_context) ());
g_source_unref (source);
}
+
+ G_UNLOCK (missing_lock);
}
/**