diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2018-12-10 23:05:13 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-10 23:05:13 -0800 |
| commit | 62674f3a36ec55f86a5f20ee028a37fbd549bd6c (patch) | |
| tree | e0e54395611c4a6eca057ea673c2d515fe45cd3b /Python/pylifecycle.c | |
| parent | 3b9a0186c44d0c3e477c38fdc00203ec99aec912 (diff) | |
| download | cpython-git-62674f3a36ec55f86a5f20ee028a37fbd549bd6c.tar.gz | |
bpo-35454: Fix miscellaneous minor issues in error handling. (GH-11077)
* bpo-35454: Fix miscellaneous minor issues in error handling.
* Fix a null pointer dereference.
(cherry picked from commit 8905fcc85a6fc3ac394bc89b0bbf40897e9497a6)
Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
Diffstat (limited to 'Python/pylifecycle.c')
| -rw-r--r-- | Python/pylifecycle.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c index 4b08c9c2b2..94b6d43c0e 100644 --- a/Python/pylifecycle.c +++ b/Python/pylifecycle.c @@ -1417,6 +1417,9 @@ new_interpreter(PyThreadState **tstate_p) PyDict_SetItemString(interp->sysdict, "modules", modules); _PySys_EndInit(interp->sysdict, &interp->config); } + else if (PyErr_Occurred()) { + goto handle_error; + } bimod = _PyImport_FindBuiltin("builtins", modules); if (bimod != NULL) { @@ -1425,6 +1428,9 @@ new_interpreter(PyThreadState **tstate_p) goto handle_error; Py_INCREF(interp->builtins); } + else if (PyErr_Occurred()) { + goto handle_error; + } /* initialize builtin exceptions */ _PyExc_Init(bimod); |