[3.6] bpo-34563: Fix for invalid assert on big output of multiprocessing.Process (GH-9027) (GH-9069)

ahcub · vstinner · commit 23f427a0fdb8 · 2018-09-07T14:17:18.000+02:00
Fix for invalid assert on big output of multiprocessing.Process. (cherry picked from commit 266f490)
diff --git a/Misc/NEWS.d/next/Library/2018-09-01-20-43-10.bpo-34563.7NQK7B.rst b/Misc/NEWS.d/next/Library/2018-09-01-20-43-10.bpo-34563.7NQK7B.rst
@@ -0,0 +1 @@
+On Windows, fix multiprocessing.Connection for very large read: fix _winapi.PeekNamedPipe() and _winapi.ReadFile() for read larger than INT_MAX (usually 2^31-1).
diff --git a/Modules/_winapi.c b/Modules/_winapi.c
@@ -1167,7 +1167,7 @@ _winapi_PeekNamedPipe_impl(PyObject *module, HANDLE handle, int size)
         }
         if (_PyBytes_Resize(&buf, nread))
             return NULL;
-        return Py_BuildValue("Nii", buf, navail, nleft);
+        return Py_BuildValue("NII", buf, navail, nleft);
     }
     else {
         Py_BEGIN_ALLOW_THREADS
@@ -1176,22 +1176,22 @@ _winapi_PeekNamedPipe_impl(PyObject *module, HANDLE handle, int size)
         if (!ret) {
             return PyErr_SetExcFromWindowsErr(PyExc_IOError, 0);
         }
-        return Py_BuildValue("ii", navail, nleft);
+        return Py_BuildValue("II", navail, nleft);
     }
 }
 
 /*[clinic input]
 _winapi.ReadFile
 
     handle: HANDLE
-    size: int
+    size: DWORD
     overlapped as use_overlapped: int(c_default='0') = False
 [clinic start generated code]*/
 
 static PyObject *
-_winapi_ReadFile_impl(PyObject *module, HANDLE handle, int size,
+_winapi_ReadFile_impl(PyObject *module, HANDLE handle, DWORD size,
                       int use_overlapped)
-/*[clinic end generated code: output=492029ca98161d84 input=8dd810194e86ac7d]*/
+/*[clinic end generated code: output=d3d5b44a8201b944 input=1b7d0ed0de1e50bc]*/
 {
     DWORD nread;
     PyObject *buf;
diff --git a/Modules/clinic/_winapi.c.h b/Modules/clinic/_winapi.c.h

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+On Windows, fix multiprocessing.Connection for very large read: fix _winapi.PeekNamedPipe() and _winapi.ReadFile() for read larger than INT_MAX (usually 2^31-1).`
Original file line number	Diff line number	Diff line change
`@@ -1167,7 +1167,7 @@ _winapi_PeekNamedPipe_impl(PyObject *module, HANDLE handle, int size)`
`1167`	`1167`	`}`
`1168`	`1168`	`if (_PyBytes_Resize(&buf, nread))`
`1169`	`1169`	`return NULL;`
`1170`		`- return Py_BuildValue("Nii", buf, navail, nleft);`
	`1170`	`+ return Py_BuildValue("NII", buf, navail, nleft);`
`1171`	`1171`	`}`
`1172`	`1172`	`else {`
`1173`	`1173`	`Py_BEGIN_ALLOW_THREADS`
`@@ -1176,22 +1176,22 @@ _winapi_PeekNamedPipe_impl(PyObject *module, HANDLE handle, int size)`
`1176`	`1176`	`if (!ret) {`
`1177`	`1177`	`return PyErr_SetExcFromWindowsErr(PyExc_IOError, 0);`
`1178`	`1178`	`}`
`1179`		`- return Py_BuildValue("ii", navail, nleft);`
	`1179`	`+ return Py_BuildValue("II", navail, nleft);`
`1180`	`1180`	`}`
`1181`	`1181`	`}`
`1182`	`1182`
`1183`	`1183`	`/*[clinic input]`
`1184`	`1184`	`_winapi.ReadFile`
`1185`	`1185`
`1186`	`1186`	`handle: HANDLE`
`1187`		`- size: int`
	`1187`	`+ size: DWORD`
`1188`	`1188`	`overlapped as use_overlapped: int(c_default='0') = False`
`1189`	`1189`	`[clinic start generated code]*/`
`1190`	`1190`
`1191`	`1191`	`static PyObject *`
`1192`		`-_winapi_ReadFile_impl(PyObject *module, HANDLE handle, int size,`
	`1192`	`+_winapi_ReadFile_impl(PyObject *module, HANDLE handle, DWORD size,`
`1193`	`1193`	`int use_overlapped)`
`1194`		`-/[clinic end generated code: output=492029ca98161d84 input=8dd810194e86ac7d]/`
	`1194`	`+/[clinic end generated code: output=d3d5b44a8201b944 input=1b7d0ed0de1e50bc]/`
`1195`	`1195`	`{`
`1196`	`1196`	`DWORD nread;`
`1197`	`1197`	`PyObject *buf;`