comparison Python/pythonrun.c @ 39970:54d177ede883 2.4

[Backport r51231 | neal.norwitz] PyModule_GetDict() can fail, produce fatal errors if this happens on startup. Klocwork #298-299.
author Andrew M. Kuchling <amk@amk.ca>
date Tue, 03 Oct 2006 19:08:48 +0000
parents bc4fbbb2db30
children 8c83fd79cee5
comparison
equal deleted inserted replaced
39969:52e9964ef922 39970:54d177ede883
183 183
184 bimod = _PyBuiltin_Init(); 184 bimod = _PyBuiltin_Init();
185 if (bimod == NULL) 185 if (bimod == NULL)
186 Py_FatalError("Py_Initialize: can't initialize __builtin__"); 186 Py_FatalError("Py_Initialize: can't initialize __builtin__");
187 interp->builtins = PyModule_GetDict(bimod); 187 interp->builtins = PyModule_GetDict(bimod);
188 if (interp->builtins == NULL)
189 Py_FatalError("Py_Initialize: can't initialize builtins dict");
188 Py_INCREF(interp->builtins); 190 Py_INCREF(interp->builtins);
189 191
190 sysmod = _PySys_Init(); 192 sysmod = _PySys_Init();
191 if (sysmod == NULL) 193 if (sysmod == NULL)
192 Py_FatalError("Py_Initialize: can't initialize sys"); 194 Py_FatalError("Py_Initialize: can't initialize sys");
193 interp->sysdict = PyModule_GetDict(sysmod); 195 interp->sysdict = PyModule_GetDict(sysmod);
196 if (interp->sysdict == NULL)
197 Py_FatalError("Py_Initialize: can't initialize sys dict");
194 Py_INCREF(interp->sysdict); 198 Py_INCREF(interp->sysdict);
195 _PyImport_FixupExtension("sys", "sys"); 199 _PyImport_FixupExtension("sys", "sys");
196 PySys_SetPath(Py_GetPath()); 200 PySys_SetPath(Py_GetPath());
197 PyDict_SetItemString(interp->sysdict, "modules", 201 PyDict_SetItemString(interp->sysdict, "modules",
198 interp->modules); 202 interp->modules);