Skip to content

gh-141749: align exceptions raised by pickle.load with _pickle.load #141754

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

Open
djoume wants to merge 1 commit into
base: main
Choose a base branch
from
+12 −2
Open

gh-141749: align exceptions raised by pickle.load with _pickle.load #141754

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
9 changes: 8 additions & 1 deletion Lib/pickle.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1349,12 +1349,19 @@ def load(self):
if not key:
raise EOFError
assert isinstance(key, bytes_types)
dispatch[key[0]](self)
try:
func = dispatch[key[0]]
except KeyError:
raise UnpicklingError(
f"invalid load key, '\\x{key[0]:02x}'.")
func(self)
except _Stop as stopinst:
return stopinst.value

# Return a list of items pushed in the stack after last MARK instruction.
def pop_mark(self):
if not self.metastack:
raise UnpicklingError("could not find MARK")
items = self.stack
self.stack = self.metastack.pop()
self.append = self.stack.append
Expand Down
2 changes: 1 addition & 1 deletion Lib/test/test_pickle.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ class PyPickleTests(AbstractPickleModuleTests, unittest.TestCase):
class PyUnpicklerTests(AbstractUnpickleTests, unittest.TestCase):

unpickler = pickle._Unpickler
bad_stack_errors = (IndexError,)
bad_stack_errors = (pickle.UnpicklingError, IndexError)
Copy link
Member

@picnixz picnixz Nov 21, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we still need to catch IndexError?

Copy link
Author

@djoume djoume Feb 14, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, IndexError is still needed. This PR only fixes specific cases (invalid opcodes, missing MARK). Many other operations like self.stack[-1], self.stack.pop() can still raise IndexError on an empty stack during normal unpickling operations.

truncated_errors = (pickle.UnpicklingError, EOFError,
AttributeError, ValueError,
struct.error, IndexError, ImportError)
Expand Down
3 changes: 3 additions & 0 deletions Misc/NEWS.d/next/Library/2025-11-19-15-23-30.gh-issue-141749.QRBf7O.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
:mod:`pickle`: align exceptions raised by the pure Python implementation of :func:`pickle.load`
with the C implementation. Previous cases raising :exc:`KeyError` or :exc:`IndexError`
now raise :exc:`~pickle.UnpicklingError`. Patch by Djoume Salvetti.
Loading