Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

gh-105375: Improve error handling in _Unpickler_SetInputStream()#105667

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.

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

Already on GitHub?Sign in to your account

Merged
Merged
Changes from1 commit
Commits
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
NextNext commit
gh-105375: Improve error handling in _Unpickler_SetInputStream()
Prevent exceptions from possibly being overwritten in case of multiplefailures.
  • Loading branch information
@erlend-aasland
erlend-aasland committedJun 11, 2023
commitf1f1a0abe19d78a080789744b417e6cc995af113
41 changes: 28 additions & 13 deletionsModules/_pickle.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1678,25 +1678,40 @@ _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;
}
(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");
int no_read_attr = 0;
if (_PyObject_LookupAttr(file, &_Py_ID(read), &self->read) < 0) {
if (!PyErr_ExceptionMatches(PyExc_AttributeError)) {
goto error;
}
Py_CLEAR(self->read);
Py_CLEAR(self->readinto);
Py_CLEAR(self->readline);
Py_CLEAR(self->peek);
return -1;
PyErr_Clear();
no_read_attr = 1;
}
int no_readline_attr = 0;
if (_PyObject_LookupAttr(file, &_Py_ID(readline), &self->readline) < 0) {
if (!PyErr_ExceptionMatches(PyExc_AttributeError)) {
goto error;
}
PyErr_Clear();
no_readline_attr = 1;
}
if (no_read_attr || no_readline_attr) {
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
Expand Down
[8]ページ先頭
©2009-2025 Movatter.jp