Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions Lib/test/test_functools.py
Original file line number Diff line number Diff line change
Expand Up @@ -406,13 +406,16 @@ def test_setstate(self):

def test_setstate_errors(self):
f = self.partial(signature)

self.assertRaises(TypeError, f.__setstate__, (capture, (), {}))
self.assertRaises(TypeError, f.__setstate__, (capture, (), {}, {}, None))
self.assertRaises(TypeError, f.__setstate__, [capture, (), {}, None])
self.assertRaises(TypeError, f.__setstate__, (None, (), {}, None))
self.assertRaises(TypeError, f.__setstate__, (capture, None, {}, None))
self.assertRaises(TypeError, f.__setstate__, (capture, [], {}, None))
self.assertRaises(TypeError, f.__setstate__, (capture, (), [], None))
self.assertRaises(TypeError, f.__setstate__, (capture, (), {}, ()))
self.assertRaises(TypeError, f.__setstate__, (capture, (), {}, 'test'))

def test_setstate_subclasses(self):
f = self.partial(signature)
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Fix arguments checking for the :meth:`!functools.partial.__setstate__` that
may lead to internal state corruption and crash. Patch by Sergey Miryanov.
3 changes: 2 additions & 1 deletion Modules/_functoolsmodule.c
Original file line number Diff line number Diff line change
Expand Up @@ -699,7 +699,8 @@ partial_setstate(PyObject *self, PyObject *state)
if (!PyArg_ParseTuple(state, "OOOO", &fn, &fnargs, &kw, &dict) ||
!PyCallable_Check(fn) ||
!PyTuple_Check(fnargs) ||
(kw != Py_None && !PyDict_Check(kw)))
(kw != Py_None && !PyDict_Check(kw)) ||
(dict != Py_None && !PyDict_Check(dict)))
{
PyErr_SetString(PyExc_TypeError, "invalid partial state");
return NULL;
Expand Down
Loading