Patch number #422106 by Greg Ball, to fix segmentation

fault in sys.displayhook.

Please check this in on the 2.2a1 branch (or whatever is necessary
to get it working next release)

1 files changed, 5 insertions, 0 deletions

diff --git a/Python/sysmodule.c b/Python/sysmodule.c
index 0d6d5a0f9f..4ae207b3c0 100644
--- 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;