Apply pybind11 commit 2b6b98e to avoid crash

wcaarls · Oct 29, 2024 · c3f2f70 · c3f2f70
1 parent 2f0b400
commit c3f2f70
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/addons/python/src/grlpy.cpp b/addons/python/src/grlpy.cpp
@@ -94,6 +94,9 @@ PYBIND11_MODULE(grlpy, m) {
         mycfg.set(item.first.attr("__str__")().cast<std::string>(), item.second.attr("__str__")().cast<std::string>());
 
         conf.reconfigure(mycfg);
+      })
+    .def("reset", [](Configurable &conf) {
+        conf.reset();
       });
 
   // Experiment

diff --git a/externals/pybind11/include/pybind11/detail/class.h b/externals/pybind11/include/pybind11/detail/class.h
@@ -222,7 +222,9 @@ inline bool deregister_instance_impl(void *ptr, instance *self) {
     auto &registered_instances = get_internals().registered_instances;
     auto range = registered_instances.equal_range(ptr);
     for (auto it = range.first; it != range.second; ++it) {
-        if (Py_TYPE(self) == Py_TYPE(it->second)) {
+        // #2252 / 2b6b98e
+        //if (Py_TYPE(self) == Py_TYPE(it->second)) {
+        if (self == it->second) {
             registered_instances.erase(it);
             return true;
         }