[Python-checkins] cpython (3.5): Issue #27587: Move null pointer check earlier in _PyState_AddModule()
berker.peksag
python-checkins at python.org
Mon Aug 22 11:06:12 EDT 2016
https://hg.python.org/cpython/rev/51627344fc58
changeset: 102839:51627344fc58
branch: 3.5
parent: 102833:7eea5b87f5fa
user: Berker Peksag <berker.peksag at gmail.com>
date: Mon Aug 22 18:05:56 2016 +0300
summary:
Issue #27587: Move null pointer check earlier in _PyState_AddModule()
This was found by PVS-Studio:
V595 The 'def' pointer was utilized before it was verified
against nullptr. Check lines: 286, 292. pystate.c 286
Initial patch by Christian Heimes.
files:
Misc/NEWS | 4 ++++
Python/pystate.c | 6 ++++--
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,10 @@
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 #27782: Multi-phase extension module import now correctly allows the
``m_methods`` field to be used to add module level functions to instances
of non-module types returned from ``Py_create_mod``. Patch by Xiang Zhang.
diff --git a/Python/pystate.c b/Python/pystate.c
--- a/Python/pystate.c
+++ b/Python/pystate.c
@@ -281,14 +281,16 @@
_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)
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list