From: Neal Norwitz <nnorwitz@gmail.com>
Date: Mon, 21 Aug 2006 20:20:59 +0000 (+0000)
Subject: Backport 51443:
X-Git-Tag: v2.5c2~54
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bebdc9e52c87373188d7f90b14e8acf1db1dfdc5;p=python

Backport 51443:
Handle a few more error conditions.

Klocwork 301 and 302.  Will backport.
---

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();