Merged revisions 74581 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r74581 | amaury.forgeotdarc | 2009-08-29 20:14:40 +0200 (sam., 29 août 2009) | 3 lines
#6750: TextIOWrapped could duplicate output when several threads write to it.
this affect text files opened with io.open(), and the print() function of py3k
........
diff --git a/Modules/_io/textio.c b/Modules/_io/textio.c
index 0f5a73d..b91852e 100644
--- a/Modules/_io/textio.c
+++ b/Modules/_io/textio.c
@@ -1213,11 +1213,18 @@
static int
_textiowrapper_writeflush(textio *self)
{
- PyObject *b, *ret;
+ PyObject *pending, *b, *ret;
if (self->pending_bytes == NULL)
return 0;
- b = _PyBytes_Join(_PyIO_empty_bytes, self->pending_bytes);
+
+ pending = self->pending_bytes;
+ Py_INCREF(pending);
+ self->pending_bytes_count = 0;
+ Py_CLEAR(self->pending_bytes);
+
+ b = _PyBytes_Join(_PyIO_empty_bytes, pending);
+ Py_DECREF(pending);
if (b == NULL)
return -1;
ret = PyObject_CallMethodObjArgs(self->buffer,
@@ -1226,8 +1233,6 @@
if (ret == NULL)
return -1;
Py_DECREF(ret);
- Py_CLEAR(self->pending_bytes);
- self->pending_bytes_count = 0;
return 0;
}