Commit 5ec44649 authored by Christian Heimes's avatar Christian Heimes

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

PyModule_GetDef() returns an error.
parents 16dbbae2 848ee099
...@@ -10,6 +10,9 @@ What's New in Python 3.4.0 Alpha 1? ...@@ -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.
......
...@@ -97,6 +97,8 @@ _PyImport_LoadDynamicModule(PyObject *name, PyObject *path, FILE *fp) ...@@ -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 */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment