bpo-37502: handle default parameter for buffers argument of pickle.loads correctly (GH-14593)

mmohrhard · pitrou · commit 898318b53d92 · 2019-07-25T18:00:34.000+02:00
diff --git a/Lib/test/pickletester.py b/Lib/test/pickletester.py
@@ -2765,6 +2765,11 @@ def test_buffers_error(self):
             with self.assertRaises(pickle.UnpicklingError):
                 self.loads(data, buffers=[])
 
+    def test_inband_accept_default_buffers_argument(self):
+        for proto in range(5, pickle.HIGHEST_PROTOCOL + 1):
+            data_pickled = self.dumps(1, proto, buffer_callback=None)
+            data = self.loads(data_pickled, buffers=None)
+
     @unittest.skipIf(np is None, "Test needs Numpy")
     def test_buffers_numpy(self):
         def check_no_copy(x, y):
diff --git a/Misc/NEWS.d/next/Library/2019-07-08-03-15-04.bpo-37502.qZGC4g.rst b/Misc/NEWS.d/next/Library/2019-07-08-03-15-04.bpo-37502.qZGC4g.rst
@@ -0,0 +1 @@
+pickle.loads() no longer raises TypeError when the buffers argument is set to None
diff --git a/Modules/_pickle.c b/Modules/_pickle.c
@@ -1653,7 +1653,7 @@ _Unpickler_SetInputEncoding(UnpicklerObject *self,
 static int
 _Unpickler_SetBuffers(UnpicklerObject *self, PyObject *buffers)
 {
-    if (buffers == NULL) {
+    if (buffers == NULL || buffers == Py_None) {
         self->buffers = NULL;
     }
     else {

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+pickle.loads() no longer raises TypeError when the buffers argument is set to None`
Original file line number	Diff line number	Diff line change
`@@ -1653,7 +1653,7 @@ _Unpickler_SetInputEncoding(UnpicklerObject *self,`
`1653`	`1653`	`static int`
`1654`	`1654`	`_Unpickler_SetBuffers(UnpicklerObject self, PyObject buffers)`
`1655`	`1655`	`{`
`1656`		`- if (buffers == NULL) {`
	`1656`	`+ if (buffers == NULL \|\| buffers == Py_None) {`
`1657`	`1657`	`self->buffers = NULL;`
`1658`	`1658`	`}`
`1659`	`1659`	`else {`