diff options
| author | Moshe Zadka <moshez@math.huji.ac.il> | 2001-07-23 13:32:43 (GMT) |
|---|---|---|
| committer | Moshe Zadka <moshez@math.huji.ac.il> | 2001-07-23 13:32:43 (GMT) |
| commit | 03897ea1f7e956e71c3f570ae836486a91b08191 (patch) | |
| tree | 052600955e377ebd54b46829eedb97f317e69c2e | |
| parent | 8fcc8e1b4fefb071eaba2150f94529e4524337d5 (diff) | |
| download | cpython-03897ea1f7e956e71c3f570ae836486a91b08191.zip cpython-03897ea1f7e956e71c3f570ae836486a91b08191.tar.gz cpython-03897ea1f7e956e71c3f570ae836486a91b08191.tar.bz2 | |
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)
| -rw-r--r-- | Python/sysmodule.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Python/sysmodule.c b/Python/sysmodule.c index 0d6d5a0..4ae207b 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; |