From: Neal Norwitz <nnorwitz@gmail.com>
Date: Sat, 12 Aug 2006 03:17:41 +0000 (+0000)
Subject: PyModule_GetDict() can fail, produce fatal errors if this happens on startup.
X-Git-Tag: v2.5c1~72
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0f7dbf731a9f2b9422fa6e08188edf654f2848a9;p=python

PyModule_GetDict() can fail, produce fatal errors if this happens on startup.

Klocwork #298-299.
---

diff --git a/Python/pythonrun.c b/Python/pythonrun.c
index 88fd67c1e5..37feeca3f3 100644
--- a/Python/pythonrun.c
+++ b/Python/pythonrun.c
@@ -203,12 +203,16 @@ Py_InitializeEx(int install_sigs)
 	if (bimod == NULL)
 		Py_FatalError("Py_Initialize: can't initialize __builtin__");
 	interp->builtins = PyModule_GetDict(bimod);
+	if (interp->builtins == NULL)
+		Py_FatalError("Py_Initialize: can't initialize builtins dict");
 	Py_INCREF(interp->builtins);
 
 	sysmod = _PySys_Init();
 	if (sysmod == NULL)
 		Py_FatalError("Py_Initialize: can't initialize sys");
 	interp->sysdict = PyModule_GetDict(sysmod);
+	if (interp->sysdict == NULL)
+		Py_FatalError("Py_Initialize: can't initialize sys dict");
 	Py_INCREF(interp->sysdict);
 	_PyImport_FixupExtension("sys", "sys");
 	PySys_SetPath(Py_GetPath());