Bruce/lua-immutable
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added slightly more error checking.

Browse Source
This commit is contained in:
Bruce Hill 2018-02-10 16:48:58 -08:00
parent 21d8c27e73
commit 4188c2164d
2 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
limmutable.c
View File

@ -107,7 +107,7 @@ static int Lcreate_instance(lua_State *L)
// Stack: [inst, buckets]
lua_createtable(L, 1, 0);
// Stack: [inst, buckets, bucket]
lua_pushlightuserdata(L, (void*)Lcreate_instance);
lua_pushlightuserdata(L, (void*)Lcreate_instance); // Shared bucket metatable
lua_gettable(L, LUA_REGISTRYINDEX);
// Stack: [inst, buckets, bucket, {'__mode'='k'}]
lua_setmetatable(L, -2);
@ -223,13 +223,17 @@ static int Lindex(lua_State *L)
// Stack: [mt, indices]
lua_pushvalue(L, 2);
// Stack: [mt, indices, k]
lua_rawget(L, -2);
lua_gettable(L, -2);
// Stack: [mt, indices, i]
if (! lua_isnil(L, -1)) {
// Stack: [mt, indices, i]
lua_getfield(L, -3, "__instances");
// Stack: [mt, indices, i, buckets]
lua_rawgeti(L, -1, *((lua_Integer*)lua_touserdata(L, 1)));
lua_Integer* hash_address = (lua_Integer*)lua_touserdata(L, 1);
if (! hash_address) {
luaL_error(L, "invalid type");
}
lua_rawgeti(L, -1, *hash_address);
// Stack: [mt, indices, i, buckets, bucket]
lua_pushvalue(L, 1);
// Stack: [mt, indices, i, buckets, bucket, inst_udata]
@ -268,7 +272,11 @@ static int Ltostring(lua_State *L)
lua_getfield(L, -1, "__instances");
// Stack: [mt, buckets]
lua_rawgeti(L, -1, *((lua_Integer*)lua_touserdata(L, 1)));
lua_Integer* hash_address = (lua_Integer*)lua_touserdata(L, 1);
if (! hash_address) {
luaL_error(L, "invalid type");
}
lua_rawgeti(L, -1, *hash_address);
// Stack: [mt, buckets, bucket]
lua_pushvalue(L, 1);
// Stack: [mt, buckets, bucket, inst_udata]
@ -317,7 +325,11 @@ static int Lnexti(lua_State *L)
// Stack: [mt]
lua_getfield(L, -1, "__instances");
// Stack: [mt, buckets]
lua_rawgeti(L, -1, *((lua_Integer*)lua_touserdata(L, 1)));
lua_Integer* hash_address = (lua_Integer*)lua_touserdata(L, 1);
if (! hash_address) {
luaL_error(L, "invalid type");
}
lua_rawgeti(L, -1, *hash_address);
// Stack: [mt, buckets, bucket]
lua_pushvalue(L, 1);
// Stack: [mt, buckets, bucket, inst_udata]
@ -357,7 +369,11 @@ static int Lnext(lua_State *L)
// Stack: [mt]
lua_getfield(L, -1, "__instances");
// Stack: [mt, buckets]
lua_rawgeti(L, -1, *((lua_Integer*)lua_touserdata(L, 1)));
lua_Integer* hash_address = (lua_Integer*)lua_touserdata(L, 1);
if (! hash_address) {
luaL_error(L, "invalid type");
}
lua_rawgeti(L, -1, *hash_address);
// Stack: [mt, buckets, bucket]
lua_pushvalue(L, 1);
// Stack: [mt, buckets, bucket, inst_udata]

8
test.lua
View File

@ -148,6 +148,14 @@ test("Testing similar class", function()
assert(FooVec(1,1) ~= Vec(1,1))
end)
test("Testing spoofing", function()
local t = {99,100}
setmetatable(t, Vec)
assert(not pcall(function() return t.x end))
assert(not pcall(function() return Vec(88) end))
assert(not pcall(function() return Vec.__tostring(t) end))
end)
if num_errors == 0 then
print(green.."All tests passed!"..reset)
else