thirdpartymirrors/sm64coopdx
1
0
Fork 0
mirror of https://github.com/coop-deluxe/sm64coopdx.git synced 2025-10-30 08:01:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added missing validations on smlua_to_string to avoid nullptr deref (#561)

Browse source
This commit is contained in:
Radek Krzyśków 2024-12-15 00:27:51 +01:00 • committed by GitHub
parent bd09ed0298
commit c03075549e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/pc/lua/smlua_cobject.c
View file

@ -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) {

1
src/pc/lua/smlua_functions.c
View file

@ -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;