luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-27 06:26:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix race in g_cancellable_cancel()

Browse Source 
We need to check priv->cancelled after taking the lock. Previously we
only checked it just before taking the lock, which left a small chance
for a race.
This commit is contained in:
Benjamin Otte 2010-03-26 20:37:09 +01:00 committed by Ryan Lortie
parent 5527a2ac2c
commit e7763678b5
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gio/gcancellable.c
View File

@ -622,6 +622,11 @@ g_cancellable_cancel (GCancellable *cancellable)
priv = cancellable->priv; priv = cancellable->priv;
G_LOCK(cancellable); G_LOCK(cancellable);
if (priv->cancelled)
{
G_UNLOCK (cancellable);
return;
}
priv->cancelled = TRUE; priv->cancelled = TRUE;
priv->cancelled_running = TRUE; priv->cancelled_running = TRUE;