[Python-checkins] cpython (merge 3.4 -> default): Issue #23998: PyImport_ReInitLock() now checks for lock allocation error

Sun Apr 19 21:15:54 CEST 2015

https://hg.python.org/cpython/rev/7ae8fd62d743
changeset: 95719:7ae8fd62d743
parent: 95715:4aab4e0cd759
parent: 95718:e0bd083fc9c1
user: Christian Heimes <christian at python.org>
date: Sun Apr 19 21:15:02 2015 +0200
summary:
 Issue #23998: PyImport_ReInitLock() now checks for lock allocation error
files:
 Misc/NEWS | 5 +++++
 Python/import.c | 6 +++++-
 2 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -213,6 +213,11 @@
 if Argument Clinic processes the same symbol multiple times, and it's emitted
 at the end of all processing rather than immediately after the first use.
 
+C API
+-----
+
+- Issue #23998: PyImport_ReInitLock() now checks for lock allocation error
+
 
 What's New in Python 3.5.0 alpha 3?
 ===================================
diff --git a/Python/import.c b/Python/import.c
--- a/Python/import.c
+++ b/Python/import.c
@@ -209,8 +209,12 @@
 void
 _PyImport_ReInitLock(void)
 {
- if (import_lock != NULL)
+ if (import_lock != NULL) {
 import_lock = PyThread_allocate_lock();
+ if (import_lock == NULL) {
+ Py_FatalError("PyImport_ReInitLock failed to create a new lock");
+ }
+ }
 if (import_lock_level > 1) {
 /* Forked as a side effect of import */
 long me = PyThread_get_thread_ident();
-- 
Repository URL: https://hg.python.org/cpython
