[Python-checkins] cpython (3.4): Issue #25182: Fix compilation on Windows

[victor.stinner]

https://hg.python.org/cpython/rev/2652c1798f7d
changeset:   98438:2652c1798f7d
branch:      3.4
parent:      98435:6347b154dd67
user:        Victor Stinner <victor.stinner at gmail.com>
date:        Wed Sep 30 15:01:34 2015 +0200
summary:
  Issue #25182: Fix compilation on Windows

Restore also errno value before calling PyErr_SetFromErrno().

files:
  Objects/fileobject.c |  9 ++++++---
  1 files changed, 6 insertions(+), 3 deletions(-)


diff --git a/Objects/fileobject.c b/Objects/fileobject.c
--- 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
@@ -411,13 +411,16 @@
 #else
     n = write(self->fd, str, n);
 #endif
-    _errno = errno;
+    /* save errno, it can be modified indirectly by Py_XDECREF() */
+    err = errno;
     Py_END_ALLOW_THREADS
+
     Py_XDECREF(bytes);
 
     if (n < 0) {
-        if (_errno == EAGAIN)
+        if (err == EAGAIN)
             Py_RETURN_NONE;
+        errno = err;
         PyErr_SetFromErrno(PyExc_IOError);
         return NULL;
     }

-- 
Repository URL: https://hg.python.org/cpython