From c03075549ee1a293dd7c67f0bd6102ca699236e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Radek=20Krzy=C5=9Bk=C3=B3w?=
 <46760021+Flower35@users.noreply.github.com>
Date: Sun, 15 Dec 2024 00:27:51 +0100
Subject: [PATCH] Added missing validations on smlua_to_string to avoid nullptr
 deref (#561)

---
 src/pc/lua/smlua_cobject.c   | 11 +++++++++++
 src/pc/lua/smlua_functions.c |  1 +
 2 files changed, 12 insertions(+)

diff --git a/src/pc/lua/smlua_cobject.c b/src/pc/lua/smlua_cobject.c
index eb7ea0388..c946e4163 100644
--- a/src/pc/lua/smlua_cobject.c
+++ b/src/pc/lua/smlua_cobject.c
@@ -386,7 +386,12 @@ static int smlua__get_field(lua_State* L) {
     CObject *cobj = lua_touserdata(L, 1);
     enum LuaObjectType lot = cobj->lot;
     u64 pointer = (u64)(intptr_t) cobj->pointer;
+
     const char *key = smlua_to_string(L, 2);
+    if (!gSmLuaConvertSuccess) {
+        LOG_LUA_LINE("Tried to get a non-string field of cobject");
+        return 0;
+    }
 
     // Legacy support
     if (strcmp(key, "_pointer") == 0) {
@@ -467,7 +472,12 @@ static int smlua__set_field(lua_State* L) {
     CObject *cobj = lua_touserdata(L, 1);
     enum LuaObjectType lot = cobj->lot;
     u64 pointer = (u64)(intptr_t) cobj->pointer;
+
     const char *key = smlua_to_string(L, 2);
+    if (!gSmLuaConvertSuccess) {
+        LOG_LUA_LINE("Tried to set a non-string field of cobject");
+        return 0;
+    }
 
     if (cobj->freed) {
         LOG_LUA_LINE("_set_field on freed object");
@@ -564,6 +574,7 @@ int smlua__gc(lua_State *L) {
 static int smlua_cpointer_get(lua_State* L) {
     CPointer *cptr = lua_touserdata(L, 1);
     const char *key = smlua_to_string(L, 2);
+    if (key == NULL) { return 0; }
 
     // Legacy support
     if (strcmp(key, "_pointer") == 0) {
diff --git a/src/pc/lua/smlua_functions.c b/src/pc/lua/smlua_functions.c
index dc3ea3b9b..4e4fbf410 100644
--- a/src/pc/lua/smlua_functions.c
+++ b/src/pc/lua/smlua_functions.c
@@ -557,6 +557,7 @@ int smlua_func_texture_override_set(lua_State* L) {
     if (!smlua_functions_valid_param_count(L, 2)) { return 0; }
 
     const char* textureName = smlua_to_string(L, 1);
+    if (!gSmLuaConvertSuccess) { LOG_LUA("texture_override_set: Failed to convert parameter 1"); return 0; }
 
     struct TextureInfo tmpOverrideTexInfo = { 0 };
     struct TextureInfo* overrideTexInfo = &tmpOverrideTexInfo;