Skip to content

gh-82565: Fix a possible assertion failure in _pickle #16606

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
merged 13 commits into from
Dec 1, 2023
Merged

gh-82565: Fix a possible assertion failure in _pickle #16606

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
afdb094
bpo-38384: Fix a possible assertion failure in _pickle
ZackerySpytz Oct 6, 2019
0898bd6
Merge remote-tracking branch 'upstream/master' into bpo-38384-pickle-…
ZackerySpytz Nov 22, 2019
b81c706
Add a test.
ZackerySpytz Nov 22, 2019
d739b61
Merge branch 'main' into bpo-38384-pickle-assert
serhiy-storchaka Oct 20, 2021
ccaeb97
Rewrite test.
serhiy-storchaka Oct 20, 2021
bf18cec
Add a NEWS entry and a test for pickler
serhiy-storchaka Oct 20, 2021
6e24487
Modify a test and the news entry (which weren't written by me).
ZackerySpytz Dec 22, 2022
cca3253
Merge branch 'main' into bpo-38384-pickle-assert
arhadthedev Apr 20, 2023
cd5f794
Address the comment of Serhiy
arhadthedev Apr 20, 2023
dd343e1
`_PyObject_LookupAttrId` -> `_PyObject_LookupAttr`
arhadthedev Apr 21, 2023
12aeed8
Merge branch 'main' into bpo-38384-pickle-assert
serhiy-storchaka Dec 1, 2023
644a1cf
Fix tests.
serhiy-storchaka Dec 1, 2023
57f6095
Remove a NEWS entry.
serhiy-storchaka Dec 1, 2023
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
33 changes: 19 additions & 14 deletions Modules/_pickle.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1609,22 +1609,27 @@ _Unpickler_SetInputStream(UnpicklerObject *self, PyObject *file)
if (_PyObject_LookupAttrId(file, &PyId_peek, &self->peek) < 0) {
return -1;
}
(void)_PyObject_LookupAttrId(file, &PyId_read, &self->read);
(void)_PyObject_LookupAttrId(file, &PyId_readinto, &self->readinto);
(void)_PyObject_LookupAttrId(file, &PyId_readline, &self->readline);
if (!self->readline || !self->readinto || !self->read) {
if (!PyErr_Occurred()) {
PyErr_SetString(PyExc_TypeError,
"file must have 'read', 'readinto' and "
"'readline' attributes");
}
Py_CLEAR(self->read);
Py_CLEAR(self->readinto);
Py_CLEAR(self->readline);
Py_CLEAR(self->peek);
return -1;
if (_PyObject_LookupAttrId(file, &PyId_read, &self->read) <= 0) {
goto error;
}
if (_PyObject_LookupAttrId(file, &PyId_readinto, &self->readinto) <= 0) {
goto error;
}
if (_PyObject_LookupAttrId(file, &PyId_readline, &self->readline) <= 0) {
goto error;
}
return 0;
error:
if (!PyErr_Occurred()) {
PyErr_SetString(PyExc_TypeError,
"file must have 'read', 'readinto' and "
"'readline' attributes");
}
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