From: Serhiy Storchaka <storchaka@gmail.com>
Date: Tue, 17 Dec 2013 15:32:20 +0000 (+0200)
Subject: Circumventing a bug in glibc (issue #17976).
X-Git-Tag: v2.7.8~190
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=78ad6583d602625320f345b152b0f4f7233e483c;p=python

Circumventing a bug in glibc (issue #17976).
Patch by Jaakko Moisio.
---

diff --git a/Objects/fileobject.c b/Objects/fileobject.c
index d3b1cf6f3f..c5e09612e2 100644
--- a/Objects/fileobject.c
+++ b/Objects/fileobject.c
@@ -1804,7 +1804,7 @@ file_write(PyFileObject *f, PyObject *args)
     const char *s;
     Py_ssize_t n, n2;
     PyObject *encoded = NULL;
-    int err = 0;
+    int err_flag = 0, err;
 
     if (f->f_fp == NULL)
         return err_closed();
@@ -1850,13 +1850,15 @@ file_write(PyFileObject *f, PyObject *args)
     FILE_BEGIN_ALLOW_THREADS(f)
     errno = 0;
     n2 = fwrite(s, 1, n, f->f_fp);
-    if (n2 != n || ferror(f->f_fp))
+    if (n2 != n || ferror(f->f_fp)) {
+        err_flag = 1;
         err = errno;
+    }
     FILE_END_ALLOW_THREADS(f)
     Py_XDECREF(encoded);
     if (f->f_binary)
         PyBuffer_Release(&pbuf);
-    if (err) {
+    if (err_flag) {
         errno = err;
         PyErr_SetFromErrno(PyExc_IOError);
         clearerr(f->f_fp);