[Python-checkins] r87734 - in python/branches/py3k: Misc/NEWS Objects/fileobject.c

Tue Jan 4 14:15:39 CET 2011

Author: victor.stinner
Date: Tue Jan 4 14:15:39 2011
New Revision: 87734
Log:
Issue #9015, #9611: stdprinter.write() clamps the length to 2^31-1 on Windows
Modified:
 python/branches/py3k/Misc/NEWS
 python/branches/py3k/Objects/fileobject.c
Modified: python/branches/py3k/Misc/NEWS
==============================================================================

--- python/branches/py3k/Misc/NEWS	(original)
+++ python/branches/py3k/Misc/NEWS	Tue Jan 4 14:15:39 2011
@@ -12,8 +12,8 @@
 doesn't have PY_SSIZE_T_CLEAN define and the size doesn't fit in an int
 (length bigger than 2^31-1 bytes).
 
-- Issue #9015, #9611: FileIO.readinto(), FileIO.write() and os.write() clamp
- the length to 2^31-1 on Windows.
+- Issue #9015, #9611: FileIO.readinto(), FileIO.write(), os.write() and
+ stdprinter.write() clamp the length to 2^31-1 on Windows.
 
 - Issue #8278: On Windows and with a NTFS filesystem, os.stat() and os.utime()
 can now handle dates after 2038.
Modified: python/branches/py3k/Objects/fileobject.c
==============================================================================
--- python/branches/py3k/Objects/fileobject.c	(original)
+++ python/branches/py3k/Objects/fileobject.c	Tue Jan 4 14:15:39 2011
@@ -344,7 +344,7 @@
 }
 
 static int
-fileio_init(PyObject *self, PyObject *args, PyObject *kwds)
+stdprinter_init(PyObject *self, PyObject *args, PyObject *kwds)
 {
 PyErr_SetString(PyExc_TypeError,
 "cannot create 'stderrprinter' instances");
@@ -390,7 +390,13 @@
 
 Py_BEGIN_ALLOW_THREADS
 errno = 0;
+#if defined(MS_WIN64) || defined(MS_WINDOWS)
+ if (n > INT_MAX)
+ n = INT_MAX;
+ n = write(self->fd, c, (int)n);
+#else
 n = write(self->fd, c, n);
+#endif
 Py_END_ALLOW_THREADS
 
 if (n < 0) {
@@ -509,7 +515,7 @@
 0, /* tp_descr_get */
 0, /* tp_descr_set */
 0, /* tp_dictoffset */
- fileio_init, /* tp_init */
+ stdprinter_init, /* tp_init */
 PyType_GenericAlloc, /* tp_alloc */
 stdprinter_new, /* tp_new */
 PyObject_Del, /* tp_free */
