Last-minute fix for Jim H: don't die after del sys.stdout

diff --git a/Python/ceval.c b/Python/ceval.c
index 8b7447cc2448c7472f7da6e9cf6cea933ec74da3..b29b5f973b2ea6687102f4d4f0fce14051abe3a3 100644 (file)
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -1017,8 +1017,12 @@ eval_code2(co, globals, locals,
                                err = Py_FlushLine();
                                if (err == 0) {
                                        x = PySys_GetObject("stdout");
-                                       if (x == NULL)
+                                       if (x == NULL) {
+                                               PyErr_SetString(
+                                                       PyExc_RuntimeError,
+                                                       "lost sys.stdout");
                                                err = -1;
+                                       }
                                }
                                if (err == 0)
                                        err = PyFile_WriteObject(v, x, 0);
@@ -1037,7 +1041,12 @@ eval_code2(co, globals, locals,
                case PRINT_ITEM:
                        v = POP();
                        w = PySys_GetObject("stdout");
-                       if (PyFile_SoftSpace(w, 1))
+                       if (w == NULL) {
+                               PyErr_SetString(PyExc_RuntimeError,
+                                               "lost sys.stdout");
+                               err = -1;
+                       }
+                       else if (PyFile_SoftSpace(w, 1))
                                err = PyFile_WriteString(" ", w);
                        if (err == 0)
                                err = PyFile_WriteObject(v, w, Py_PRINT_RAW);