python · serhiy-storchaka · Sep 10, 2023 · Mar 25, 2023 · Mar 26, 2023 · Mar 26, 2023
diff --git a/Lib/pickle.py b/Lib/pickle.py
@@ -396,6 +396,8 @@ def decode_long(data):
     return int.from_bytes(data, byteorder='little', signed=True)
 
 
+_NoValue = object()
+
 # Pickling machinery
 
 class _Pickler:
@@ -542,8 +544,8 @@ def save(self, obj, save_persistent_id=True):
             return
 
         rv = NotImplemented
-        reduce = getattr(self, "reducer_override", None)
-        if reduce is not None:
+        reduce = getattr(self, "reducer_override", _NoValue)
+        if reduce is not _NoValue:
             rv = reduce(obj)
 
         if rv is NotImplemented:
@@ -556,8 +558,8 @@ def save(self, obj, save_persistent_id=True):
 
             # Check private dispatch table if any, or else
             # copyreg.dispatch_table
-            reduce = getattr(self, 'dispatch_table', dispatch_table).get(t)
-            if reduce is not None:
+            reduce = getattr(self, 'dispatch_table', dispatch_table).get(t, _NoValue)
+            if reduce is not _NoValue:
                 rv = reduce(obj)
             else:
                 # Check for a class with a custom metaclass; treat as regular
@@ -567,12 +569,12 @@ def save(self, obj, save_persistent_id=True):
                     return
 
                 # Check for a __reduce_ex__ method, fall back to __reduce__
-                reduce = getattr(obj, "__reduce_ex__", None)
-                if reduce is not None:
+                reduce = getattr(obj, "__reduce_ex__", _NoValue)
+                if reduce is not _NoValue:
                     rv = reduce(self.proto)
                 else:
-                    reduce = getattr(obj, "__reduce__", None)
-                    if reduce is not None:
+                    reduce = getattr(obj, "__reduce__", _NoValue)
+                    if reduce is not _NoValue:
                         rv = reduce()
                     else:
                         raise PicklingError("Can't pickle %r object: %r" %
@@ -1705,8 +1707,8 @@ def load_build(self):
         stack = self.stack
         state = stack.pop()
         inst = stack[-1]
-        setstate = getattr(inst, "__setstate__", None)
-        if setstate is not None:
+        setstate = getattr(inst, "__setstate__", _NoValue)
+        if setstate is not _NoValue:
             setstate(state)
             return
         slotstate = None

diff --git a/Lib/test/test_pickle.py b/Lib/test/test_pickle.py
@@ -570,6 +570,22 @@ def test_multiprocessing_exceptions(self):
                                  ('multiprocessing.context', name))
 
 
+class PickleReductionMethodsTests(unittest.TestCase):
+
+    def test_pickle_invalid_reduction_method(self):
+        class C:
+            __reduce_ex__ = None
+        c = C()
+        with self.assertRaises(TypeError):
+            pickle.dumps(c)
+
+        class C:
+            __reduce__ = None
+        c = C()
+        with self.assertRaises(TypeError):
+            pickle.dumps(c)
+
+
 def load_tests(loader, tests, pattern):
     tests.addTest(doctest.DocTestSuite())
     return tests

diff --git a/Misc/NEWS.d/next/Core and Builtins/2023-03-26-19-11-10.gh-issue-93627.0UgwBL.rst b/Misc/NEWS.d/next/Core and Builtins/2023-03-26-19-11-10.gh-issue-93627.0UgwBL.rst
@@ -0,0 +1 @@
+Update the Python pickle module implementation to match the C implementation of the pickle module. For objects setting reduction methods like ``__reduce_ex__`` or ``__reduce__`` to ``None``, pickling will result in a ``TypeError``.
diff --git a/Modules/_pickle.c b/Modules/_pickle.c
@@ -4010,7 +4010,7 @@ save_reduce(PickleState *st, PicklerObject *self, PyObject *args,
     size = PyTuple_Size(args);
     if (size < 2 || size > 6) {
         PyErr_SetString(st->PicklingError, "tuple returned by "
-                        "__reduce__ must contain 2 through 6 elements");
+                        "__reduce__ must contain 2 to 6 elements");
         return -1;
     }
 
@@ -4440,6 +4440,7 @@ save(PickleState *st, PicklerObject *self, PyObject *obj, int pers_save)
             Py_INCREF(reduce_func);
         }
     }
+    // check private dispatch table
     else if (PyMapping_GetOptionalItem(self->dispatch_table, (PyObject *)type,
                                        &reduce_func) < 0)
     {
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Update the Python pickle module implementation to match the C implementation of the pickle module. For objects setting reduction methods like ``__reduce_ex__`` or ``__reduce__`` to ``None``, pickling will result in a ``TypeError``.
eendebakpt marked this conversation as resolved. Show resolved Hide resolved