diff options
| author | Neal Norwitz <nnorwitz@gmail.com> | 2006-08-21 20:20:59 +0000 |
|---|---|---|
| committer | Neal Norwitz <nnorwitz@gmail.com> | 2006-08-21 20:20:59 +0000 |
| commit | bebdc9e52c87373188d7f90b14e8acf1db1dfdc5 (patch) | |
| tree | 7cfab3cc80fb8ce680f31e230fddc04a12b78073 /Python | |
| parent | 47f0ffa7ee22a58802e206780a563997df1cc326 (diff) | |
| download | cpython-git-bebdc9e52c87373188d7f90b14e8acf1db1dfdc5.tar.gz | |
Backport 51443:
Handle a few more error conditions.
Klocwork 301 and 302. Will backport.
Diffstat (limited to 'Python')
| -rw-r--r-- | Python/pythonrun.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Python/pythonrun.c b/Python/pythonrun.c index 37feeca3f3..e8f4fa2e56 100644 --- a/Python/pythonrun.c +++ b/Python/pythonrun.c @@ -531,11 +531,15 @@ Py_NewInterpreter(void) bimod = _PyImport_FindExtension("__builtin__", "__builtin__"); if (bimod != NULL) { interp->builtins = PyModule_GetDict(bimod); + if (interp->builtins == NULL) + goto handle_error; Py_INCREF(interp->builtins); } sysmod = _PyImport_FindExtension("sys", "sys"); if (bimod != NULL && sysmod != NULL) { interp->sysdict = PyModule_GetDict(sysmod); + if (interp->sysdict == NULL) + goto handle_error; Py_INCREF(interp->sysdict); PySys_SetPath(Py_GetPath()); PyDict_SetItemString(interp->sysdict, "modules", @@ -549,6 +553,7 @@ Py_NewInterpreter(void) if (!PyErr_Occurred()) return tstate; +handle_error: /* Oops, it didn't work. Undo it all. */ PyErr_Print(); |