[3.6] bpo-31070: Fix a race condition in importlib _get_module_lock(). (GH-3033). (#3038)

serhiy-storchaka · web-flow · commit f3b891718e10 · 2017-08-09T14:56:13.000+03:00
(cherry picked from commit 9b0d1d6)
diff --git a/Lib/importlib/_bootstrap.py b/Lib/importlib/_bootstrap.py
@@ -172,8 +172,18 @@ def _get_module_lock(name):
                 lock = _DummyModuleLock(name)
             else:
                 lock = _ModuleLock(name)
-            def cb(_):
-                del _module_locks[name]
+
+            def cb(ref, name=name):
+                _imp.acquire_lock()
+                try:
+                    # bpo-31070: Check if another thread created a new lock
+                    # after the previous lock was destroyed
+                    # but before the weakref callback was called.
+                    if _module_locks.get(name) is ref:
+                        del _module_locks[name]
+                finally:
+                    _imp.release_lock()
+
             _module_locks[name] = _weakref.ref(lock, cb)
     finally:
         _imp.release_lock()
diff --git a/Misc/NEWS.d/next/Core and Builtins/2017-08-09-09-40-54.bpo-31070.oDyLiI.rst b/Misc/NEWS.d/next/Core and Builtins/2017-08-09-09-40-54.bpo-31070.oDyLiI.rst
@@ -0,0 +1 @@
+Fix a race condition in importlib _get_module_lock().
diff --git a/Python/importlib.h b/Python/importlib.h

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Fix a race condition in importlib _get_module_lock().`