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

bugfix: Keep registered types until after Py_Finalize(). Fix #4459 #4486

Merged
merged 2 commits into from
Feb 6, 2023
Merged

bugfix: Keep registered types until after Py_Finalize(). Fix #4459 #4486

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a29a591
Keep registered types until after Py_Finalize(). Fix #4459
Skylion007 Feb 2, 2023
7eb618c
Address reviewer comments
Skylion007 Feb 2, 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
7 changes: 5 additions & 2 deletions include/pybind11/embed.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,13 +254,16 @@ inline void finalize_interpreter() {
if (builtins.contains(id) && isinstance<capsule>(builtins[id])) {
internals_ptr_ptr = capsule(builtins[id]);
}

Py_Finalize();

// Local internals contains data managed by the current interpreter, so we must clear them to
// avoid undefined behaviors when initializing another interpreter
// Must be cleared only after Py_Finalize() so atexit and other hooks can still use
// registered_types
detail::get_local_internals().registered_types_cpp.clear();
detail::get_local_internals().registered_exception_translators.clear();

Py_Finalize();

if (internals_ptr_ptr) {
delete *internals_ptr_ptr;
*internals_ptr_ptr = nullptr;
Expand Down