Skip to content
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

Jump to bottom

fix: PyCapsule_GetDestructor is allowed to return a nullptr destructor #4221

Merged
merged 4 commits into from
Oct 7, 2022
Merged

fix: PyCapsule_GetDestructor is allowed to return a nullptr destructor #4221

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1da4759
fix: PyCapsule_GetDestructor is allowed to return a nullptr destructor
galv Oct 7, 2022
f626d7d
Add test for the fix.
Oct 7, 2022
015828a
Update tests/test_pytypes.cpp
rwgk Oct 7, 2022
4b31750
style: pre-commit fixes
pre-commit-ci[bot] Oct 7, 2022
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
12 changes: 6 additions & 6 deletions include/pybind11/pytypes.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1829,18 +1829,18 @@ class capsule : public object {
// guard if destructor called while err indicator is set
error_scope error_guard;
auto destructor = reinterpret_cast<void (*)(void *)>(PyCapsule_GetContext(o));
if (destructor == nullptr) {
if (PyErr_Occurred()) {
throw error_already_set();
}
pybind11_fail("Unable to get capsule context");
if (PyErr_Occurred()) {
throw error_already_set();
}
const char *name = get_name_in_error_scope(o);
void *ptr = PyCapsule_GetPointer(o, name);
if (ptr == nullptr) {
throw error_already_set();
}
destructor(ptr);

if (destructor != nullptr) {
destructor(ptr);
}
});

if (!m_ptr || PyCapsule_SetContext(m_ptr, (void *) destructor) != 0) {
Expand Down