From 17ef84804bd0e43319935104e2c7c85b3a459060 Mon Sep 17 00:00:00 2001
From: Vicki Pfau <vi@endrift.com>
Date: Wed, 25 Jan 2023 04:47:15 -0800
Subject: [PATCH] Scripting: Lua nullity fixes

---
 src/script/engines/lua.c | 18 +++++++++++++++++-
 src/script/test/lua.c    | 14 +++++++++++---
 2 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/src/script/engines/lua.c b/src/script/engines/lua.c
index 37327ee54..3c7266a2a 100644
--- a/src/script/engines/lua.c
+++ b/src/script/engines/lua.c
@@ -738,7 +738,19 @@ bool _luaWrap(struct mScriptEngineContextLua* luaContext, struct mScriptValue* v
 		}
 		break;
 	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;
 	case mSCRIPT_TYPE_LIST:
 		newValue = lua_newuserdata(luaContext->lua, sizeof(*newValue));
@@ -769,6 +781,10 @@ bool _luaWrap(struct mScriptEngineContextLua* luaContext, struct mScriptValue* v
 		mScriptValueDeref(value);
 		break;
 	case mSCRIPT_TYPE_OBJECT:
+		if (!value->value.opaque) {
+			lua_pushnil(luaContext->lua);
+			break;
+		}
 		newValue = lua_newuserdata(luaContext->lua, sizeof(*newValue));
 		if (needsWeakref) {
 			*newValue = mSCRIPT_MAKE(WEAKREF, weakref);
diff --git a/src/script/test/lua.c b/src/script/test/lua.c
index ec478fc3c..2c047ec39 100644
--- a/src/script/test/lua.c
+++ b/src/script/test/lua.c
@@ -371,15 +371,23 @@ M_TEST_DEFINE(callCFunc) {
 
 	mScriptContextDeinit(&context);
 }
-M_TEST_DEFINE(globalStructNull) {
+M_TEST_DEFINE(globalNull) {
 	SETUP_LUA;
 
 	struct Test s = {};
-
+	struct mScriptValue* val;
 	struct mScriptValue 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);
 	assert_true(lua->setGlobal(lua, "a", &a));
 	assert_true(lua->run(lua));
@@ -728,7 +736,7 @@ M_TEST_SUITE_DEFINE_SETUP_TEARDOWN(mScriptLua,
 	cmocka_unit_test(rootScope),
 	cmocka_unit_test(callLuaFunc),
 	cmocka_unit_test(callCFunc),
-	cmocka_unit_test(globalStructNull),
+	cmocka_unit_test(globalNull),
 	cmocka_unit_test(globalStructFieldGet),
 	cmocka_unit_test(globalStructFieldSet),
 	cmocka_unit_test(globalStructMethods),