From 301448f78a6d1a5d2728a696fd5bf0414b9c916a Mon Sep 17 00:00:00 2001 From: MysterD Date: Wed, 8 Nov 2023 12:22:24 -0800 Subject: [PATCH] Fixed crash in DynOS_Actor_AddCustom() --- data/dynos_mgr_actor.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/data/dynos_mgr_actor.cpp b/data/dynos_mgr_actor.cpp index 2e6fa1cd..4562dbae 100644 --- a/data/dynos_mgr_actor.cpp +++ b/data/dynos_mgr_actor.cpp @@ -25,12 +25,16 @@ static Array>& DynosCustomActors() { void DynOS_Actor_AddCustom(const SysPath &aFilename, const char *aActorName) { - const void* georef = DynOS_Builtin_Actor_GetFromName(aActorName); - u16 actorLen = strlen(aActorName); char* actorName = (char*)calloc(1, sizeof(char) * (actorLen + 1)); strcpy(actorName, aActorName); + const void* georef = DynOS_Builtin_Actor_GetFromName(aActorName); + if (!georef) { + PrintError(" ERROR: Couldn't find georef for \"%s\"", actorName); + free(actorName); + } + GfxData *_GfxData = DynOS_Actor_LoadFromBinary(aFilename, actorName, aFilename, false); if (!_GfxData) { PrintError(" ERROR: Couldn't load Actor Binary \"%s\" from \"%s\"", actorName, aFilename.c_str());