Flush std{in,out,err} before closing it. Fixes #1074011.

diff --git a/Misc/NEWS b/Misc/NEWS
index 223c0fe67c7e6837556a0c545aea1eff29ba6b31..ef1b0869609bfac492bf42548e31f5a5f4b54357 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -12,6 +12,9 @@ What's New in Python 2.3.5?
 Core and builtins
 -----------------
 
+- Bug #1074011: closing sys.std{in,out,err} now causes a flush() and 
+  an ferror() call.
+
 - Bug #1055820 Cyclic garbage collection was not protecting against that
   calling a live weakref to a piece of cyclic trash could resurrect an
   insane mutation of the trash if any Python code ran during gc (via

diff --git a/Python/sysmodule.c b/Python/sysmodule.c
index c98e9f1856fc24d4f8733152ee08570e7010ab5b..ed1dd9e1c108464a7caed24f886edac132d4deac 100644 (file)
--- a/Python/sysmodule.c
+++ b/Python/sysmodule.c
@@ -896,6 +896,13 @@ settrace() -- set the global debug tracing function\n\
 )
 /* end of sys_doc */ ;
 
+static int
+_check_and_flush (FILE *stream)
+{
+  int prev_fail = ferror (stream);
+  return fflush (stream) || prev_fail ? EOF : 0;
+}
+
 PyObject *
 _PySys_Init(void)
 {
@@ -909,9 +916,9 @@ _PySys_Init(void)
        m = Py_InitModule3("sys", sys_methods, sys_doc);
        sysdict = PyModule_GetDict(m);
 
-       sysin = PyFile_FromFile(stdin, "<stdin>", "r", NULL);
-       sysout = PyFile_FromFile(stdout, "<stdout>", "w", NULL);
-       syserr = PyFile_FromFile(stderr, "<stderr>", "w", NULL);
+       sysin = PyFile_FromFile(stdin, "<stdin>", "r", _check_and_flush);
+       sysout = PyFile_FromFile(stdout, "<stdout>", "w", _check_and_flush);
+       syserr = PyFile_FromFile(stderr, "<stderr>", "w", _check_and_flush);
        if (PyErr_Occurred())
                return NULL;
 #ifdef MS_WINDOWS