mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-31 14:07:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Issue #18426: Fix NULL pointer dereference in C extension import when

Browse source 
PyModule_GetDef() returns an error.
This commit is contained in:
Christian Heimes 2013-07-11 11:23:34 +02:00
commit 5ec44649df
2 changed files with 5 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Misc/NEWS
View file

@ -10,6 +10,9 @@ What's New in Python 3.4.0 Alpha 1?
Core and Builtins Core and Builtins
----------------- -----------------
- Issue #18426: Fix NULL pointer dereference in C extension import when
PyModule_GetDef() returns an error.
- Issue #17206: On Windows, increase the stack size from 2 MB to 4.2 MB to fix - Issue #17206: On Windows, increase the stack size from 2 MB to 4.2 MB to fix
a stack overflow in the marshal module (fix a crash in test_marshal). a stack overflow in the marshal module (fix a crash in test_marshal).
Patch written by Jeremy Kloth. Patch written by Jeremy Kloth.

2
Python/importdl.c
View file

@ -97,6 +97,8 @@ _PyImport_LoadDynamicModule(PyObject *name, PyObject *path, FILE *fp)
/* Remember pointer to module init function. */ /* Remember pointer to module init function. */
def = PyModule_GetDef(m); def = PyModule_GetDef(m);
if (def == NULL)
goto error;
def->m_base.m_init = p; def->m_base.m_init = p;
/* Remember the filename as the __file__ attribute */ /* Remember the filename as the __file__ attribute */