]> git.sesse.net Git - vlc/commitdiff
Win32: fix race condition initializing static mutexes
authorRémi Denis-Courmont <rdenis@simphalempin.com>
Tue, 16 Dec 2008 19:51:04 +0000 (21:51 +0200)
committerRémi Denis-Courmont <rdenis@simphalempin.com>
Tue, 16 Dec 2008 19:51:04 +0000 (21:51 +0200)
src/misc/threads.c

index a7c133e96bfc73b3f52e5f09682f9258857dce53..4d618d49d11214e928f4e9db0e212638cf8d0ea0 100644 (file)
@@ -360,7 +360,8 @@ void vlc_mutex_lock (vlc_mutex_t *p_mutex)
         assert (p_mutex != &super_mutex); /* this one cannot be static */
 
         vlc_mutex_lock (&super_mutex);
-        vlc_mutex_init (p_mutex);
+        if (InterlockedCompareExchange (&p_mutex->initialized, 0, 0) == 0)
+            vlc_mutex_init (p_mutex);
         /* FIXME: destroy the mutex some time... */
         vlc_mutex_unlock (&super_mutex);
     }