diff options
| author | Serhiy Storchaka <storchaka@gmail.com> | 2018-12-11 06:38:03 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-11 06:38:03 (GMT) |
| commit | 8905fcc85a6fc3ac394bc89b0bbf40897e9497a6 (patch) | |
| tree | 5b7afcdceab6dae37e3db90f952c5c76fe46b5cf /Python/import.c | |
| parent | bb86bf4c4eaa30b1f5192dab9f389ce0bb61114d (diff) | |
| download | cpython-8905fcc85a6fc3ac394bc89b0bbf40897e9497a6.zip cpython-8905fcc85a6fc3ac394bc89b0bbf40897e9497a6.tar.gz cpython-8905fcc85a6fc3ac394bc89b0bbf40897e9497a6.tar.bz2 | |
bpo-35454: Fix miscellaneous minor issues in error handling. (#11077)
* bpo-35454: Fix miscellaneous minor issues in error handling.
* Fix a null pointer dereference.
Diffstat (limited to 'Python/import.c')
| -rw-r--r-- | Python/import.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Python/import.c b/Python/import.c index 15637c6..c4f0877 100644 --- a/Python/import.c +++ b/Python/import.c @@ -2143,10 +2143,10 @@ _imp_create_dynamic_impl(PyObject *module, PyObject *spec, PyObject *file) } mod = _PyImport_FindExtensionObject(name, path); - if (mod != NULL) { + if (mod != NULL || PyErr_Occurred()) { Py_DECREF(name); Py_DECREF(path); - Py_INCREF(mod); + Py_XINCREF(mod); return mod; } |