Skip to content

Remove memory leaks, with this patch it doesn't leak anymore (Windows… #2125

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

Closed
wants to merge 2 commits into from
Closed

Remove memory leaks, with this patch it doesn't leak anymore (Windows… #2125

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b1f2858
Remove memory leaks, with this patch it doesn't leak anymore (Windows…
erwincoumans Feb 28, 2020
72bfd81
undo the static PyModuleDef part (re-introducing 1 leak)
erwincoumans Feb 28, 2020
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
19 changes: 19 additions & 0 deletions include/pybind11/detail/internals.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,24 @@ inline internals **&get_internals_pp() {
return internals_pp;
}

inline void delete_internals_pp() {
detail::internals** internals_ptr_ptr = get_internals_pp();
if (internals_ptr_ptr) {
auto*& internals_ptr = *internals_ptr_ptr;
auto elem = internals_ptr->registered_types_cpp.begin();
while (elem != internals_ptr->registered_types_cpp.end()) {
type_info* ti = elem->second;
delete ti;
elem++;
}
internals_ptr->registered_types_cpp.clear();
delete internals_ptr;
delete internals_ptr_ptr;
internals_ptr_ptr = nullptr;
}
}


inline void translate_exception(std::exception_ptr p) {
try {
if (p) std::rethrow_exception(p);
Expand Down Expand Up @@ -269,6 +287,7 @@ PYBIND11_NOINLINE inline internals &get_internals() {
(*internals_pp)->registered_exception_translators.push_front(&translate_local_exception);
#endif
} else {
Py_AtExit(delete_internals_pp);
if (!internals_pp) internals_pp = new internals*();
auto *&internals_ptr = *internals_pp;
internals_ptr = new internals();
Expand Down