StarMirror/sol2
1
0
Fork 0
mirror of https://github.com/ThePhD/sol2.git synced 2024-03-22 13:10:44 +08:00
Code Issues Projects Releases Wiki Activity

Fix double-delete crash that could also be affecting @IronsDu

Browse Source
This commit is contained in:
ThePhD 2016-11-23 02:39:52 -05:00
parent 320276dabf
commit b40f895fd4
4 changed files with 46 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
single/sol/sol.hpp
View File

@ -20,8 +20,8 @@
// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
// This file was generated with a script. // This file was generated with a script.
// Generated 2016-11-18 05:05:58.487868 UTC // Generated 2016-11-23 07:39:25.032134 UTC
// This header was generated with sol v2.15.1 (revision 97cafba) // This header was generated with sol v2.15.1 (revision 320276d)
// https://github.com/ThePhD/sol2 // https://github.com/ThePhD/sol2
#ifndef SOL_SINGLE_INCLUDE_HPP #ifndef SOL_SINGLE_INCLUDE_HPP
@ -4139,7 +4139,7 @@ namespace sol {
template <typename T> template <typename T>
inline int user_alloc_destroy(lua_State* L) { inline int user_alloc_destroy(lua_State* L) {
void* rawdata = lua_touserdata(L, upvalue_index(1)); void* rawdata = lua_touserdata(L, 1);
T* data = static_cast<T*>(rawdata); T* data = static_cast<T*>(rawdata);
std::allocator<T> alloc; std::allocator<T> alloc;
alloc.destroy(data); alloc.destroy(data);
@ -6176,8 +6176,7 @@ namespace sol {
lua_CFunction cdel = detail::user_alloc_destroy<T>; lua_CFunction cdel = detail::user_alloc_destroy<T>;
// Make sure we have a plain GC set for this data // Make sure we have a plain GC set for this data
if (luaL_newmetatable(L, name) != 0) { if (luaL_newmetatable(L, name) != 0) {
lua_pushlightuserdata(L, rawdata); lua_pushcclosure(L, cdel, 0);
lua_pushcclosure(L, cdel, 1);
lua_setfield(L, -2, "__gc"); lua_setfield(L, -2, "__gc");
} }
lua_setmetatable(L, -2); lua_setmetatable(L, -2);

2
sol/stack_core.hpp
View File

@ -62,7 +62,7 @@ namespace sol {
template <typename T> template <typename T>
inline int user_alloc_destroy(lua_State* L) { inline int user_alloc_destroy(lua_State* L) {
void* rawdata = lua_touserdata(L, upvalue_index(1)); void* rawdata = lua_touserdata(L, 1);
T* data = static_cast<T*>(rawdata); T* data = static_cast<T*>(rawdata);
std::allocator<T> alloc; std::allocator<T> alloc;
alloc.destroy(data); alloc.destroy(data);

3
sol/stack_push.hpp
View File

@ -351,8 +351,7 @@ namespace sol {
lua_CFunction cdel = detail::user_alloc_destroy<T>; lua_CFunction cdel = detail::user_alloc_destroy<T>;
// Make sure we have a plain GC set for this data // Make sure we have a plain GC set for this data
if (luaL_newmetatable(L, name) != 0) { if (luaL_newmetatable(L, name) != 0) {
lua_pushlightuserdata(L, rawdata); lua_pushcclosure(L, cdel, 0);
lua_pushcclosure(L, cdel, 1);
lua_setfield(L, -2, "__gc"); lua_setfield(L, -2, "__gc");
} }
lua_setmetatable(L, -2); lua_setmetatable(L, -2);

40
test_functions.cpp
View File

@ -947,3 +947,43 @@ TEST_CASE("functions/stack-protect", "make sure functions don't impede on the st
} }
REQUIRE(sg.check_stack()); REQUIRE(sg.check_stack());
} }
TEST_CASE("functions/same-type-closures", "make sure destructions are per-object, not per-type, by destroying one type multiple times") {
static std::set<void*> last_my_closures;
static bool checking_closures = false;
static bool check_failed = false;
struct my_closure {
int& n;
my_closure(int& n) : n(n) {}
~my_closure() noexcept(false) {
if (!checking_closures)
return;
void* addr = static_cast<void*>(this);
auto f = last_my_closures.find(addr);
if (f != last_my_closures.cend()) {
check_failed = true;
}
last_my_closures.insert(f, addr);
}
int operator() () {
++n; return n;
}
};
int n = 250;
my_closure a(n);
my_closure b(n);
{
sol::state lua;
lua.set_function("f", a);
lua.set_function("g", b);
checking_closures = true;
}
REQUIRE_FALSE(check_failed);
REQUIRE(last_my_closures.size() == 2);
}