Rooba
/
cpython
mirror of https://github.com/python/cpython.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[3.11] gh-105375: Improve error handling in _Unpickler_SetInputStream() (#105667) (#105721) 

Prevent exceptions from possibly being overwritten in case of multiple
failures.

(cherry picked from commit 217589d4f3)
This commit is contained in:
Erlend E. Aasland 2023-06-13 11:07:20 +02:00 committed by GitHub
parent 36c393c044
commit 2b1745f37c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Misc/NEWS.d/next/Library/2023-06-11-22-46-06.gh-issue-105375.YkhSNt.rst Normal file
View File

@ -0,0 +1,2 @@
Fix a bug in :c:func:`!_Unpickler_SetInputStream` where an exception could
end up being overwritten in case of failure.

31
Modules/_pickle.c
View File

@ -1666,25 +1666,30 @@ _Unpickler_SetInputStream(UnpicklerObject *self, PyObject *file)
{
/* Optional file methods */
if (_PyObject_LookupAttr(file, &_Py_ID(peek), &self->peek) < 0) {
return -1;
goto error;
}
if (_PyObject_LookupAttr(file, &_Py_ID(readinto), &self->readinto) < 0) {
return -1;
goto error;
}
if (_PyObject_LookupAttr(file, &_Py_ID(read), &self->read) < 0) {
goto error;
}
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;
PyErr_SetString(PyExc_TypeError,
"file must have 'read' and 'readline' attributes");
goto error;
}
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