File tree Expand file tree Collapse file tree 1 file changed +2
-2
lines changed Expand file tree Collapse file tree 1 file changed +2
-2
lines changed Original file line number Diff line number Diff line change @@ -1829,7 +1829,7 @@ class capsule : public object {
1829
1829
// guard if destructor called while err indicator is set
1830
1830
error_scope error_guard;
1831
1831
auto destructor = reinterpret_cast <void (*)(void *)>(PyCapsule_GetContext (o));
1832
- if (PyErr_Occurred ()) {
1832
+ if (destructor == nullptr && PyErr_Occurred ()) {
1833
1833
throw error_already_set ();
1834
1834
}
1835
1835
const char *name = get_name_in_error_scope (o);
@@ -1843,7 +1843,7 @@ class capsule : public object {
1843
1843
}
1844
1844
});
1845
1845
1846
- if (!m_ptr || PyCapsule_SetContext (m_ptr, ( void *) destructor) != 0 ) {
1846
+ if (!m_ptr || PyCapsule_SetContext (m_ptr, reinterpret_cast < void *>( destructor) ) != 0 ) {
1847
1847
throw error_already_set ();
1848
1848
}
1849
1849
}
You can’t perform that action at this time.
0 commit comments