Merge pull request #201 from hubx/mutex-fix

Hotfix race condition in mutex creation/deletion

Author: frerich

clcache.py

@@ -259,11 +259,14 @@ class CacheLock(object):
 
     def __init__(self, mutexName, timeoutMs):
         self._mutexName = 'Local\\' + mutexName
+        self._mutex = None
+        self._timeoutMs = timeoutMs
+
+    def createMutex(self):
         self._mutex = windll.kernel32.CreateMutexW(
-            wintypes.INT(0),
-            wintypes.INT(0),
+            None,
+            wintypes.BOOL(False),
             self._mutexName)
-        self._timeoutMs = timeoutMs
         assert self._mutex
 
     def __enter__(self):
@@ -273,9 +276,12 @@ def __exit__(self, typ, value, traceback):
         self.release()
 
     def __del__(self):
-        windll.kernel32.CloseHandle(self._mutex)
+        if self._mutex:
+            windll.kernel32.CloseHandle(self._mutex)
 
     def acquire(self):
+        if not self._mutex:
+            self.createMutex()
         result = windll.kernel32.WaitForSingleObject(
             self._mutex, wintypes.INT(self._timeoutMs))
         if result not in [0, self.WAIT_ABANDONED_CODE]: