Skip to content

gh-135573: Add tests for pickle opcodes with wrong types #144950

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
serhiy-storchaka merged 1 commit into from
Feb 18, 2026
+23 −6
Merged

gh-135573: Add tests for pickle opcodes with wrong types #144950

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 23 additions & 0 deletions Lib/test/pickletester.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1484,6 +1484,29 @@ def __hash__(self):
# bad hashable dict key
self.check_unpickling_error(CustomError, base + b'}c__main__\nBadKey1\n)\x81Nsb.')

def test_bad_types(self):
# APPEND
self.assertEqual(self.loads(b']Na.'), [None])
self.check_unpickling_error(AttributeError, b'NNa.') # non-list
# APPENDS
self.assertEqual(self.loads(b'](Ne.'), [None])
self.check_unpickling_error(AttributeError, b'N(Ne.') # non-list
self.check_unpickling_error(AttributeError, b'N(e.')
# SETITEM
self.assertEqual(self.loads(b'}NNs.'), {None: None})
self.check_unpickling_error(TypeError, b'NNNs.') # non-dict
self.check_unpickling_error(TypeError, b'}]Ns.') # non-hashable key
# SETITEMS
self.assertEqual(self.loads(b'}(NNu.'), {None: None})
self.check_unpickling_error(TypeError, b'N(NNu.') # non-dict
self.assertEqual(self.loads(b'N(u.'), None) # no validation for empty items
self.check_unpickling_error(TypeError, b'}(]Nu.') # non-hashable key
# ADDITEMS
self.assertEqual(self.loads(b'\x8f(N\x90.'), {None})
self.check_unpickling_error(AttributeError, b'N(N\x90.') # non-set
self.check_unpickling_error(AttributeError, b'N(\x90.')
self.check_unpickling_error(TypeError, b'\x8f(]\x90.') # non-hashable element

def test_bad_stack(self):
badpickles = [
b'.', # STOP
Expand Down
6 changes: 0 additions & 6 deletions Modules/_pickle.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6663,8 +6663,6 @@ do_append(PickleState *state, UnpicklerObject *self, Py_ssize_t x)
len = Py_SIZE(self->stack);
if (x > len || x <= self->stack->fence)
return Pdata_stack_underflow(state, self->stack);
if (len == x) /* nothing to do */
return 0;

list = self->stack->data[x - 1];

Expand Down Expand Up @@ -6754,8 +6752,6 @@ do_setitems(PickleState *st, UnpicklerObject *self, Py_ssize_t x)
len = Py_SIZE(self->stack);
if (x > len || x <= self->stack->fence)
return Pdata_stack_underflow(st, self->stack);
if (len == x) /* nothing to do */
return 0;
if ((len - x) % 2 != 0) {
/* Corrupt or hostile pickle -- we never write one like this. */
PyErr_SetString(st->UnpicklingError,
Expand Down Expand Up @@ -6807,8 +6803,6 @@ load_additems(PickleState *state, UnpicklerObject *self)
len = Py_SIZE(self->stack);
if (mark > len || mark <= self->stack->fence)
return Pdata_stack_underflow(state, self->stack);
if (len == mark) /* nothing to do */
return 0;

set = self->stack->data[mark - 1];

Expand Down
Loading