backport of 2.90:

Patch number #422106 by Greg Ball, to fix segmentation
fault in sys.displayhook.

diff --git a/Python/sysmodule.c b/Python/sysmodule.c
index 52fbbc89d32db6c10c81ff3813ac6809aa615bd3..45b8b3a96cad3049a3dca90942da3ae88f8fea20 100644 (file)
--- a/Python/sysmodule.c
+++ b/Python/sysmodule.c
@@ -75,6 +75,11 @@ sys_displayhook(PyObject *self, PyObject *args)
        PyObject *modules = interp->modules;
        PyObject *builtins = PyDict_GetItemString(modules, "__builtin__");
 
+       if (builtins == NULL) {
+               PyErr_SetString(PyExc_RuntimeError, "lost __builtin__");
+               return NULL;
+       }
+
        /* parse arguments */
        if (!PyArg_ParseTuple(args, "O:displayhook", &o))
                return NULL;