cpython: 51627344fc58 (original) (raw)

Mercurial > cpython

changeset 102839:51627344fc58 3.5

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. [#27587]

Berker Peksag berker.peksag@gmail.com
date	Mon, 22 Aug 2016 18:05:56 +0300
parents	7eea5b87f5fa
children	7d90bf4780ff e3466a556d81
files	Misc/NEWS Python/pystate.c
diffstat	2 files changed, 8 insertions(+), 2 deletions(-)[+] [-] Misc/NEWS 4 Python/pystate.c 6

line wrap: on

line diff

--- a/Misc/NEWS +++ b/Misc/NEWS @@ -10,6 +10,10 @@ Release date: TBA 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.

--- a/Python/pystate.c +++ b/Python/pystate.c @@ -281,14 +281,16 @@ int _PyState_AddModule(PyObject* module, struct PyModuleDef* def) { PyInterpreterState *state;

if (!def) {
```
   assert(PyErr_Occurred());[](#l2.8)
```
```
   return -1;[](#l2.9)
```
} 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;[](#l2.18)
```
if (!state->modules_by_index) { state->modules_by_index = PyList_New(0); if (!state->modules_by_index)