mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 00:48:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

bpo-35454: Fix miscellaneous minor issues in error handling. (#11077)

Browse source 
* bpo-35454: Fix miscellaneous minor issues in error handling.

* Fix a null pointer dereference.
This commit is contained in:
Serhiy Storchaka 2018-12-11 08:38:03 +02:00 • committed by GitHub
parent bb86bf4c4e
commit 8905fcc85a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 44 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Python/pylifecycle.c
View file

@ -1286,6 +1286,9 @@ new_interpreter(PyThreadState **tstate_p)
PyDict_SetItemString(interp->sysdict, "modules", modules);
_PySys_EndInit(interp->sysdict, interp);
}
else if (PyErr_Occurred()) {
goto handle_error;
}
bimod = _PyImport_FindBuiltin("builtins", modules);
if (bimod != NULL) {
@ -1294,6 +1297,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);