FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

gh-105375: Improve _pickle error handling by erlend-aasland · Pull Request #105475 · python/cpython · GitHub

  1. python
  2. cpython

Repository navigation

gh-105375: Improve _pickle error handling #105475

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
erlend-aasland merged 7 commits into from
Jun 9, 2023
Conversation 23 Commits 7 Checks 0 Files changed
Merged

gh-105375: Improve _pickle error handling #105475

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9b514d5
gh-105375: Improve _pickle error handling
erlend-aasland Jun 7, 2023
a91713a
Bail early from _Unpickler_SetInputStream() also
erlend-aasland Jun 7, 2023
32ef468
Revert "Bail early from _Unpickler_SetInputStream() also"
erlend-aasland Jun 8, 2023
7d6821a
Add NEWS
erlend-aasland Jun 8, 2023
e8f324f
Pull in main
erlend-aasland Jun 8, 2023
e9b7ebd
Pull in main
erlend-aasland Jun 9, 2023
f6e7be7
Add back decrefs
erlend-aasland Jun 9, 2023
File filter

Filter by extension

Filter by extension .c  (1) All 1 file type selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
Prev Previous commit
Next Next commit
Revert "Bail early from _Unpickler_SetInputStream() also" 
This reverts commit a91713a.
  • Loading branch information
erlend-aasland committed Jun 8, 2023
commit 32ef4684fce889366709b308d95fca0f6c024366
28 changes: 14 additions & 14 deletions Modules/_pickle.c
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -1678,25 +1678,25 @@ _Unpickler_SetInputStream(UnpicklerObject *self, PyObject *file)
{
/* Optional file methods */
if (_PyObject_LookupAttr(file, &_Py_ID(peek), &self->peek) < 0) {
goto error;
return -1;
}
if (_PyObject_LookupAttr(file, &_Py_ID(readinto), &self->readinto) < 0) {
goto error;
}
if (_PyObject_LookupAttr(file, &_Py_ID(read), &self->read) < 0) {
goto error;
return -1;
}
if (_PyObject_LookupAttr(file, &_Py_ID(readline), &self->readline) < 0) {
goto error;
(void)_PyObject_LookupAttr(file, &_Py_ID(read), &self->read);
(void)_PyObject_LookupAttr(file, &_Py_ID(readline), &self->readline);
if (!self->readline || !self->read) {
if (!PyErr_Occurred()) {
PyErr_SetString(PyExc_TypeError,
"file must have 'read' and 'readline' attributes");
}
Py_CLEAR(self->read);
Py_CLEAR(self->readinto);
Py_CLEAR(self->readline);
Py_CLEAR(self->peek);
return -1;
}
return 0;

error:
Py_CLEAR(self->read);
Py_CLEAR(self->readinto);
Py_CLEAR(self->readline);
Py_CLEAR(self->peek);
return -1;
}

/* Returns -1 (with an exception set) on failure, 0 on success. This may
Expand Down
Back | FazBrowse Home | New Git URL