Skip to content

gh-104371: Fix calls to __release_buffer__ while an exception is active #104378

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 3 commits into from
May 12, 2023
Merged

gh-104371: Fix calls to __release_buffer__ while an exception is active #104378

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9abea7e
gh-104371: Fix calls to __release_buffer__ while an exception is active
JelleZijlstra May 11, 2023
0576d26
Avoid extra function
JelleZijlstra May 12, 2023
a29d72b
use PyErr_GetRaisedException
kumaraditya303 May 12, 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
Prev Previous commit
use PyErr_GetRaisedException
  • Loading branch information
@kumaraditya303
kumaraditya303 committed May 12, 2023
commit a29d72b0f92d553f1900e21f384659a566bc208d
5 changes: 2 additions & 3 deletions Objects/typeobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9121,8 +9121,7 @@ releasebuffer_call_python(PyObject *self, Py_buffer *buffer)
// We have no way to report additional errors up the stack, because
// this slot returns void, so we simply stash away the active exception
// and restore it after the call to Python returns.
PyObject *type, *value, *traceback;
PyErr_Fetch(&type, &value, &traceback);
PyObject *exc = PyErr_GetRaisedException();

PyObject *mv;
bool is_buffer_wrapper = Py_TYPE(buffer->obj) == &_PyBufferWrapper_Type;
Expand Down Expand Up @@ -9165,7 +9164,7 @@ releasebuffer_call_python(PyObject *self, Py_buffer *buffer)
end:
assert(!PyErr_Occurred());

PyErr_Restore(type, value, traceback);
PyErr_SetRaisedException(exc);
}

/*
Expand Down