From 489e79192a19d55d153f5c2fdbb2e3579eb4d671 Mon Sep 17 00:00:00 2001 From: ccuser44 <68124053+ccuser44@users.noreply.github.com> Date: Thu, 2 Jan 2025 15:13:04 +0200 Subject: [PATCH 1/8] Remove metatable check --- VM/src/ltablib.cpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/VM/src/ltablib.cpp b/VM/src/ltablib.cpp index 75d9f400..a0dbabcb 100644 --- a/VM/src/ltablib.cpp +++ b/VM/src/ltablib.cpp @@ -585,10 +585,7 @@ static int tisfrozen(lua_State* L) static int tclone(lua_State* L) { luaL_checktype(L, 1, LUA_TTABLE); - luaL_argcheck(L, !luaL_getmetafield(L, 1, "__metatable"), 1, "table has a protected metatable"); - Table* tt = luaH_clone(L, hvalue(L->base)); - TValue v; sethvalue(L, &v, tt); luaA_pushobject(L, &v); From bb14db9d911e29aa36b6fc5c848d7c209491fe77 Mon Sep 17 00:00:00 2001 From: ccuser44 <68124053+ccuser44@users.noreply.github.com> Date: Thu, 2 Jan 2025 15:25:09 +0200 Subject: [PATCH 2/8] Only assign metatable to clone if `__metatable` is undefined --- VM/src/ltable.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/VM/src/ltable.cpp b/VM/src/ltable.cpp index dafb2b3f..635212f6 100644 --- a/VM/src/ltable.cpp +++ b/VM/src/ltable.cpp @@ -797,7 +797,6 @@ Table* luaH_clone(lua_State* L, Table* tt) { Table* t = luaM_newgco(L, Table, sizeof(Table), L->activememcat); luaC_init(L, t, LUA_TTABLE); - t->metatable = tt->metatable; t->tmcache = tt->tmcache; t->array = NULL; t->sizearray = 0; @@ -808,6 +807,9 @@ Table* luaH_clone(lua_State* L, Table* tt) t->node = cast_to(LuaNode*, dummynode); t->lastfree = 0; + if (!luaL_getmetafield(L, 1, "__metatable")) + t->metatable = tt->metatable; + if (tt->sizearray) { t->array = luaM_newarray(L, tt->sizearray, TValue, t->memcat); From 7446be330efe7d8a8a91dd24a058bbace5d4ef9e Mon Sep 17 00:00:00 2001 From: ccuser44 <68124053+ccuser44@users.noreply.github.com> Date: Thu, 2 Jan 2025 15:32:41 +0200 Subject: [PATCH 3/8] Add explanatory note comment --- VM/src/ltable.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VM/src/ltable.cpp b/VM/src/ltable.cpp index 635212f6..ad2825e2 100644 --- a/VM/src/ltable.cpp +++ b/VM/src/ltable.cpp @@ -807,7 +807,7 @@ Table* luaH_clone(lua_State* L, Table* tt) t->node = cast_to(LuaNode*, dummynode); t->lastfree = 0; - if (!luaL_getmetafield(L, 1, "__metatable")) + if (!luaL_getmetafield(L, 1, "__metatable")) // Prevent unauthorized assigning of locked metatables t->metatable = tt->metatable; if (tt->sizearray) From c1829b37e9cf080dd85809b5a020fb448894dee7 Mon Sep 17 00:00:00 2001 From: ccuser44 <68124053+ccuser44@users.noreply.github.com> Date: Thu, 2 Jan 2025 15:57:06 +0200 Subject: [PATCH 4/8] Fix issue with invalid usage of field function and non-table.clone usage of `luaH_clone` breaking --- VM/src/ltable.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/VM/src/ltable.cpp b/VM/src/ltable.cpp index ad2825e2..115292b3 100644 --- a/VM/src/ltable.cpp +++ b/VM/src/ltable.cpp @@ -793,7 +793,7 @@ int luaH_getn(Table* t) } } -Table* luaH_clone(lua_State* L, Table* tt) +Table* luaH_clone(lua_State* L, Table* tt, bool raw) { Table* t = luaM_newgco(L, Table, sizeof(Table), L->activememcat); luaC_init(L, t, LUA_TTABLE); @@ -807,7 +807,7 @@ Table* luaH_clone(lua_State* L, Table* tt) t->node = cast_to(LuaNode*, dummynode); t->lastfree = 0; - if (!luaL_getmetafield(L, 1, "__metatable")) // Prevent unauthorized assigning of locked metatables + if (raw) // Prevent unauthorized assigning of locked metatables t->metatable = tt->metatable; if (tt->sizearray) From ba4b95ac5fd3296413bede39ef798188f3c17873 Mon Sep 17 00:00:00 2001 From: ccuser44 <68124053+ccuser44@users.noreply.github.com> Date: Thu, 2 Jan 2025 15:58:47 +0200 Subject: [PATCH 5/8] Supply raw argument to luaH_clone --- VM/src/ltablib.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VM/src/ltablib.cpp b/VM/src/ltablib.cpp index a0dbabcb..6e6c9216 100644 --- a/VM/src/ltablib.cpp +++ b/VM/src/ltablib.cpp @@ -585,7 +585,7 @@ static int tisfrozen(lua_State* L) static int tclone(lua_State* L) { luaL_checktype(L, 1, LUA_TTABLE); - Table* tt = luaH_clone(L, hvalue(L->base)); + Table* tt = luaH_clone(L, hvalue(L->base), luaL_getmetafield(L, 1, "__metatable") ? true : false); TValue v; sethvalue(L, &v, tt); luaA_pushobject(L, &v); From 780c7037225eff7e5cebeebfa372af69c6f8c149 Mon Sep 17 00:00:00 2001 From: ccuser44 <68124053+ccuser44@users.noreply.github.com> Date: Thu, 2 Jan 2025 16:09:53 +0200 Subject: [PATCH 6/8] Add support for raw argument in header file --- VM/src/ltable.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VM/src/ltable.h b/VM/src/ltable.h index 021f21bf..0c0690ce 100644 --- a/VM/src/ltable.h +++ b/VM/src/ltable.h @@ -27,7 +27,7 @@ LUAI_FUNC void luaH_resizehash(lua_State* L, Table* t, int nhsize); LUAI_FUNC void luaH_free(lua_State* L, Table* t, struct lua_Page* page); LUAI_FUNC int luaH_next(lua_State* L, Table* t, StkId key); LUAI_FUNC int luaH_getn(Table* t); -LUAI_FUNC Table* luaH_clone(lua_State* L, Table* tt); +LUAI_FUNC Table* luaH_clone(lua_State* L, Table* tt, bool raw); LUAI_FUNC void luaH_clear(Table* tt); #define luaH_setslot(L, t, slot, key) (invalidateTMcache(t), (slot == luaO_nilobject ? luaH_newkey(L, t, key) : cast_to(TValue*, slot))) From a72b6b2d47c4c6574ede5dab490344820f85ce16 Mon Sep 17 00:00:00 2001 From: ccuser44 <68124053+ccuser44@users.noreply.github.com> Date: Thu, 2 Jan 2025 16:10:18 +0200 Subject: [PATCH 7/8] Fix arg condition --- VM/src/ltable.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VM/src/ltable.cpp b/VM/src/ltable.cpp index 115292b3..3be917e4 100644 --- a/VM/src/ltable.cpp +++ b/VM/src/ltable.cpp @@ -807,7 +807,7 @@ Table* luaH_clone(lua_State* L, Table* tt, bool raw) t->node = cast_to(LuaNode*, dummynode); t->lastfree = 0; - if (raw) // Prevent unauthorized assigning of locked metatables + if (!raw) // Prevent unauthorized assigning of locked metatables t->metatable = tt->metatable; if (tt->sizearray) From 9d0da620305049f200aa10da1e352c7d5f041e3f Mon Sep 17 00:00:00 2001 From: ccuser44 <68124053+ccuser44@users.noreply.github.com> Date: Thu, 2 Jan 2025 16:14:55 +0200 Subject: [PATCH 8/8] Fix definition for codebuilder --- CodeGen/src/NativeState.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CodeGen/src/NativeState.h b/CodeGen/src/NativeState.h index 941db252..7b42deb8 100644 --- a/CodeGen/src/NativeState.h +++ b/CodeGen/src/NativeState.h @@ -49,7 +49,7 @@ struct NativeContext int (*luaH_getn)(Table* t) = nullptr; Table* (*luaH_new)(lua_State* L, int narray, int lnhash) = nullptr; - Table* (*luaH_clone)(lua_State* L, Table* tt) = nullptr; + Table* (*luaH_clone)(lua_State* L, Table* tt, bool raw) = nullptr; void (*luaH_resizearray)(lua_State* L, Table* t, int nasize) = nullptr; TValue* (*luaH_setnum)(lua_State* L, Table* t, int key);