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

Scripting: Lua nullity fixes

This commit is contained in:
Vicki Pfau 2023-01-25 04:47:15 -08:00
parent dfd772d2ca
commit 17ef84804b
2 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -738,7 +738,19 @@ bool _luaWrap(struct mScriptEngineContextLua* luaContext, struct mScriptValue* v
} }
break; break;
case mSCRIPT_TYPE_STRING: case mSCRIPT_TYPE_STRING:
lua_pushlstring(luaContext->lua, value->value.string->buffer, value->value.string->size); if (!value->value.string) {
lua_pushnil(luaContext->lua);
break;
}
if (value->type == mSCRIPT_TYPE_MS_STR) {
lua_pushlstring(luaContext->lua, value->value.string->buffer, value->value.string->size);
break;
}
if (value->type == mSCRIPT_TYPE_MS_CHARP) {
lua_pushstring(luaContext->lua, value->value.copaque);
break;
}
ok = false;
break; break;
case mSCRIPT_TYPE_LIST: case mSCRIPT_TYPE_LIST:
newValue = lua_newuserdata(luaContext->lua, sizeof(*newValue)); newValue = lua_newuserdata(luaContext->lua, sizeof(*newValue));
@ -769,6 +781,10 @@ bool _luaWrap(struct mScriptEngineContextLua* luaContext, struct mScriptValue* v
mScriptValueDeref(value); mScriptValueDeref(value);
break; break;
case mSCRIPT_TYPE_OBJECT: case mSCRIPT_TYPE_OBJECT:
if (!value->value.opaque) {
lua_pushnil(luaContext->lua);
break;
}
newValue = lua_newuserdata(luaContext->lua, sizeof(*newValue)); newValue = lua_newuserdata(luaContext->lua, sizeof(*newValue));
if (needsWeakref) { if (needsWeakref) {
*newValue = mSCRIPT_MAKE(WEAKREF, weakref); *newValue = mSCRIPT_MAKE(WEAKREF, weakref);

14
src/script/test/lua.c
View File

@ -371,15 +371,23 @@ M_TEST_DEFINE(callCFunc) {
mScriptContextDeinit(&context); mScriptContextDeinit(&context);
} }
M_TEST_DEFINE(globalStructNull) { M_TEST_DEFINE(globalNull) {
SETUP_LUA; SETUP_LUA;
struct Test s = {}; struct Test s = {};
struct mScriptValue* val;
struct mScriptValue a; struct mScriptValue a;
LOAD_PROGRAM("assert(a)"); LOAD_PROGRAM("assert(a)");
a = mSCRIPT_MAKE_CHARP("hello");
assert_true(lua->setGlobal(lua, "a", &a));
assert_true(lua->run(lua));
a = mSCRIPT_MAKE_CHARP(NULL);
assert_true(lua->setGlobal(lua, "a", &a));
assert_false(lua->run(lua));
a = mSCRIPT_MAKE_S(Test, &s); a = mSCRIPT_MAKE_S(Test, &s);
assert_true(lua->setGlobal(lua, "a", &a)); assert_true(lua->setGlobal(lua, "a", &a));
assert_true(lua->run(lua)); assert_true(lua->run(lua));
@ -728,7 +736,7 @@ M_TEST_SUITE_DEFINE_SETUP_TEARDOWN(mScriptLua,
cmocka_unit_test(rootScope), cmocka_unit_test(rootScope),
cmocka_unit_test(callLuaFunc), cmocka_unit_test(callLuaFunc),
cmocka_unit_test(callCFunc), cmocka_unit_test(callCFunc),
cmocka_unit_test(globalStructNull), cmocka_unit_test(globalNull),
cmocka_unit_test(globalStructFieldGet), cmocka_unit_test(globalStructFieldGet),
cmocka_unit_test(globalStructFieldSet), cmocka_unit_test(globalStructFieldSet),
cmocka_unit_test(globalStructMethods), cmocka_unit_test(globalStructMethods),