Zengtudor/pybind11
1
0
Fork 0
mirror of https://github.com/pybind/pybind11.git synced 2024-11-22 13:15:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use weakref to clean up captured function object in def_buffer (#2634)

Browse Source
This commit is contained in:
Yannick Jadoul 2020-11-02 18:39:40 +01:00 committed by GitHub
parent 06a54018c8
commit 7d6713a46d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/pybind11/pybind11.h
View File

@ -1315,7 +1315,8 @@ public:
return *this; return *this;
} }
template <typename Func> class_& def_buffer(Func &&func) { template <typename Func>
class_& def_buffer(Func &&func) {
struct capture { Func func; }; struct capture { Func func; };
auto *ptr = new capture { std::forward<Func>(func) }; auto *ptr = new capture { std::forward<Func>(func) };
install_buffer_funcs([](PyObject *obj, void *ptr) -> buffer_info* { install_buffer_funcs([](PyObject *obj, void *ptr) -> buffer_info* {
@ -1324,6 +1325,10 @@ public:
return nullptr; return nullptr;
return new buffer_info(((capture *) ptr)->func(caster)); return new buffer_info(((capture *) ptr)->func(caster));
}, ptr); }, ptr);
weakref(m_ptr, cpp_function([ptr](handle wr) {
delete ptr;
wr.dec_ref();
})).release();
return *this; return *this;
} }