From: Serhiy Storchaka <storchaka@gmail.com>
Date: Sat, 24 Feb 2018 16:55:51 +0000 (+0200)
Subject: bpo-31966: Fixed WindowsConsoleIO.write() for writing empty data. (GH-5754)
X-Git-Tag: v3.8.0a1~2175
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=42c35d9c0c8175332f50fbe034a001fe52f057b9;p=thirdparty%2FPython%2Fcpython.git

bpo-31966: Fixed WindowsConsoleIO.write() for writing empty data. (GH-5754)
---

diff --git a/Lib/test/test_winconsoleio.py b/Lib/test/test_winconsoleio.py
index 656483cf1621..a78fa4d7d919 100644
--- a/Lib/test/test_winconsoleio.py
+++ b/Lib/test/test_winconsoleio.py
@@ -121,6 +121,10 @@ class WindowsConsoleIOTests(unittest.TestCase):
             else:
                 self.assertNotIsInstance(f, ConIO)
 
+    def test_write_empty_data(self):
+        with ConIO('CONOUT$', 'w') as f:
+            self.assertEqual(f.write(b''), 0)
+
     def assertStdinRoundTrip(self, text):
         stdin = open('CONIN$', 'r')
         old_stdin = sys.stdin
diff --git a/Misc/NEWS.d/next/Windows/2018-02-19-13-54-42.bpo-31966._Q3HPb.rst b/Misc/NEWS.d/next/Windows/2018-02-19-13-54-42.bpo-31966._Q3HPb.rst
new file mode 100644
index 000000000000..042a4d835abf
--- /dev/null
+++ b/Misc/NEWS.d/next/Windows/2018-02-19-13-54-42.bpo-31966._Q3HPb.rst
@@ -0,0 +1 @@
+Fixed WindowsConsoleIO.write() for writing empty data.
diff --git a/Modules/_io/winconsoleio.c b/Modules/_io/winconsoleio.c
index 30d1c767afcf..b85c11b3405a 100644
--- a/Modules/_io/winconsoleio.c
+++ b/Modules/_io/winconsoleio.c
@@ -964,6 +964,9 @@ _io__WindowsConsoleIO_write_impl(winconsoleio *self, Py_buffer *b)
     if (!self->writable)
         return err_mode("writing");
 
+    if (!b->len) {
+        return PyLong_FromLong(0);
+    }
     if (b->len > BUFMAX)
         len = BUFMAX;
     else