From 3ce7873fddef05ecd6c5da2d5bd40206fee3805c Mon Sep 17 00:00:00 2001 From: Christian Heimes Date: Sun, 19 Apr 2015 21:08:28 +0200 Subject: Issue #23998: PyImport_ReInitLock() now checks for lock allocation error --- Misc/NEWS | 2 ++ Python/import.c | 6 +++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Misc/NEWS b/Misc/NEWS index 7577f00..b06d5b1 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -263,6 +263,8 @@ Build C API ----- +- Issue #23998: PyImport_ReInitLock() now checks for lock allocation error + - Issue #22079: PyType_Ready() now checks that statically allocated type has no dynamically allocated bases. diff --git a/Python/import.c b/Python/import.c index 92363b3..e47ce63 100644 --- a/Python/import.c +++ b/Python/import.c @@ -337,8 +337,12 @@ _PyImport_ReleaseLock(void) 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"); + } + } import_lock_thread = -1; import_lock_level = 0; } -- cgit v0.12