commit ae86da9b204b0fe2510309bd9fae688e7c9a35fb
author Victor Stinner <victor.stinner@gmail.com> Wed Sep 30 15:03:31 2015 +0200
committer Victor Stinner <victor.stinner@gmail.com> Wed Sep 30 15:03:31 2015 +0200
tree 3ee9cbd8cdf8ee3107f5777e28f9fa62ef8eb555
parent 008fc77e1e443e799be19aebb697b7daf335a0c7
parent 89719e1daf8b15810145baf56d984ecbc1bab7ef

(Merge 3.4) Issue #25182: Fix compilation on Windows

Objects/fileobject.c

diff --git a/Objects/fileobject.c b/Objects/fileobject.c
index a836cb3..234d07e 100644
--- a/Objects/fileobject.c
+++ b/Objects/fileobject.c
@@ -376,7 +376,7 @@
     PyObject *bytes = NULL;
     char *str;
     Py_ssize_t n;
-    int _errno;
+    int err;
 
     if (self->fd < 0) {
         /* fd might be invalid on Windows
@@ -403,10 +403,13 @@
     }
 
     n = _Py_write(self->fd, str, n);
-    _errno = errno;
+    /* save errno, it can be modified indirectly by Py_XDECREF() */
+    err = errno;
+
     Py_XDECREF(bytes);
+
     if (n == -1) {
-        if (_errno == EAGAIN) {
+        if (err == EAGAIN) {
             PyErr_Clear();
             Py_RETURN_NONE;
         }