Issue #27587: Merge from 3.5

2 files changed, 8 insertions, 2 deletions

diff --git a/Misc/NEWS b/Misc/NEWS
index cbbb424..c2265d6 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,10 @@ What's New in Python 3.6.0 beta 1
 Core and Builtins
 -----------------
 
+- Issue #27587: Fix another issue found by PVS-Studio: Null pointer check
+  after use of 'def' in _PyState_AddModule().
+  Initial patch by Christian Heimes.
+
 - Issue #27792: The modulo operation applied to ``bool`` and other
   ``int`` subclasses now always returns an ``int``. Previously
   the return type depended on the input values. Patch by Xiang Zhang.
diff --git a/Python/pystate.c b/Python/pystate.c
index b1aecec..25110b2 100644
--- a/Python/pystate.c
+++ b/Python/pystate.c
@@ -285,14 +285,16 @@ int
 _PyState_AddModule(PyObject* module, struct PyModuleDef* def)
 {
     PyInterpreterState *state;
+    if (!def) {
+        assert(PyErr_Occurred());
+        return -1;
+    }
     if (def->m_slots) {
         PyErr_SetString(PyExc_SystemError,
                         "PyState_AddModule called on module with slots");
         return -1;
     }
     state = GET_INTERP_STATE();
-    if (!def)
-        return -1;
     if (!state->modules_by_index) {
         state->modules_by_index = PyList_New(0);
         if (!state->modules_by_index)