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 88fd67c1e57ac19b1687b5229700e85a84342e64..37feeca3f3ab8eafeefb49fd6e3f1d1a7584444b 100644 (file)
--- 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());