ShuriZma
/
mgba
mirror of https://github.com/mgba-emu/mgba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Scripting: Fix table unwrapping

This commit is contained in:
Vicki Pfau 2023-02-01 18:14:37 -08:00
parent 5164b888d8
commit 0193bc3a83
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/script/engines/lua.c
View File

@ -1202,8 +1202,11 @@ int _luaGetTable(lua_State* lua) {
} }
lua_pop(lua, 2); lua_pop(lua, 2);
obj = mScriptContextAccessWeakref(luaContext->d.context, obj); obj = mScriptContextAccessWeakref(luaContext->d.context, obj);
if (!obj) { if (obj->type->base == mSCRIPT_TYPE_WRAPPER) {
obj = mScriptValueUnwrap(obj);
}
if (!obj || obj->type != mSCRIPT_TYPE_MS_TABLE) {
luaL_traceback(lua, lua, "Invalid table", 1); luaL_traceback(lua, lua, "Invalid table", 1);
return lua_error(lua); return lua_error(lua);
} }
@ -1235,7 +1238,10 @@ int _luaLenTable(lua_State* lua) {
lua_pop(lua, 1); lua_pop(lua, 1);
obj = mScriptContextAccessWeakref(luaContext->d.context, obj); obj = mScriptContextAccessWeakref(luaContext->d.context, obj);
if (!obj) { if (obj->type->base == mSCRIPT_TYPE_WRAPPER) {
obj = mScriptValueUnwrap(obj);
}
if (!obj || obj->type != mSCRIPT_TYPE_MS_TABLE) {
luaL_traceback(lua, lua, "Invalid table", 1); luaL_traceback(lua, lua, "Invalid table", 1);
return lua_error(lua); return lua_error(lua);
} }
@ -1271,7 +1277,10 @@ static int _luaNextTable(lua_State* lua) {
lua_pop(lua, 2); lua_pop(lua, 2);
table = mScriptContextAccessWeakref(luaContext->d.context, table); table = mScriptContextAccessWeakref(luaContext->d.context, table);
if (!table) { if (table->type->base == mSCRIPT_TYPE_WRAPPER) {
table = mScriptValueUnwrap(table);
}
if (!table || table->type != mSCRIPT_TYPE_MS_TABLE) {
luaL_traceback(lua, lua, "Invalid table", 1); luaL_traceback(lua, lua, "Invalid table", 1);
return lua_error(lua); return lua_error(lua);
} }

7
src/script/types.c
View File

@ -944,14 +944,11 @@ bool mScriptTableRemove(struct mScriptValue* table, struct mScriptValue* key) {
} }
struct mScriptValue* mScriptTableLookup(struct mScriptValue* table, struct mScriptValue* key) { struct mScriptValue* mScriptTableLookup(struct mScriptValue* table, struct mScriptValue* key) {
if (table->type->base == mSCRIPT_TYPE_WRAPPER) {
table = mScriptValueUnwrap(table);
}
if (table->type != mSCRIPT_TYPE_MS_TABLE) { if (table->type != mSCRIPT_TYPE_MS_TABLE) {
return false; return NULL;
} }
if (!key->type->hash) { if (!key->type->hash) {
return false; return NULL;
} }
return HashTableLookupCustom(table->value.table, key); return HashTableLookupCustom(table->value.table, key);
} }