diff options
| author | Berker Peksag <berker.peksag@gmail.com> | 2016-08-22 15:07:02 (GMT) |
|---|---|---|
| committer | Berker Peksag <berker.peksag@gmail.com> | 2016-08-22 15:07:02 (GMT) |
| commit | c98afb7a26ac611a4544c5b8dd445d8ea05e6360 (patch) | |
| tree | 0ca23f749d81d88c76524911678bedc4ed9667bf /Python | |
| parent | ad7b6c3720da0b12296a6fd69d882fc1bc296d99 (diff) | |
| parent | 4b7b565c581f8f418df6e661ebf7d906794e7142 (diff) | |
| download | cpython-c98afb7a26ac611a4544c5b8dd445d8ea05e6360.zip cpython-c98afb7a26ac611a4544c5b8dd445d8ea05e6360.tar.gz cpython-c98afb7a26ac611a4544c5b8dd445d8ea05e6360.tar.bz2 | |
Issue #27587: Merge from 3.5
Diffstat (limited to 'Python')
| -rw-r--r-- | Python/pystate.c | 6 |
1 files changed, 4 insertions, 2 deletions
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) |