Merged revisions 81841 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r81841 | victor.stinner | 2010-06-08 22:46:00 +0200 (mar., 08 juin 2010) | 6 lines

  sys_pyfile_write() does nothing if file is NULL

  mywrite() falls back to the C file object if sys_pyfile_write() returns an
  error. This patch fixes a segfault is Py_FatalError() is called in an early
  stage of Python initialization.
........

diff --git a/Python/sysmodule.c b/Python/sysmodule.c
index ea67710423f5218ef3e54ece0ee75986c2bec025..e33047308d1ac43ae5d8321988452bc37961da01 100644 (file)
--- a/Python/sysmodule.c
+++ b/Python/sysmodule.c
@@ -1670,6 +1670,9 @@ sys_pyfile_write(const char *text, PyObject *file)
     PyObject *unicode = NULL, *writer = NULL, *args = NULL, *result = NULL;
     int err;
 
+    if (file == NULL)
+        return -1;
+
     unicode = PyUnicode_FromString(text);
     if (unicode == NULL)
         goto error;