mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-01-31 06:32:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

(command.c) Prevent allocations until most early returns have

Browse Source 
stopped
This commit is contained in:
twinaphex 2019-05-27 17:55:38 +02:00
parent e906a3c0b2
commit 93ed7c7848
1 changed files with 34 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
command.c
View File

@ -1164,33 +1164,35 @@ static void command_event_load_auto_state(void)
{ {
bool ret; bool ret;
char msg[128] = {0}; char msg[128] = {0};
char *savestate_name_auto = (char*)calloc(PATH_MAX_LENGTH, char *savestate_name_auto = NULL;
sizeof(*savestate_name_auto));
size_t savestate_name_auto_size = PATH_MAX_LENGTH * sizeof(char); size_t savestate_name_auto_size = PATH_MAX_LENGTH * sizeof(char);
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
global_t *global = global_get_ptr(); global_t *global = global_get_ptr();
#ifdef HAVE_NETWORKING #ifdef HAVE_NETWORKING
if (netplay_driver_ctl(RARCH_NETPLAY_CTL_IS_ENABLED, NULL)) if (netplay_driver_ctl(RARCH_NETPLAY_CTL_IS_ENABLED, NULL))
goto error; return;
#endif #endif
#ifdef HAVE_CHEEVOS #ifdef HAVE_CHEEVOS
/* RCHEEVOS TODO: remove OR below */ /* RCHEEVOS TODO: remove OR below */
if (cheevos_hardcore_active || rcheevos_hardcore_active) if (cheevos_hardcore_active || rcheevos_hardcore_active)
goto error; return;
#endif #endif
if (!global || !settings->bools.savestate_auto_load)
return;
if (!settings->bools.savestate_auto_load) savestate_name_auto = (char*)calloc(PATH_MAX_LENGTH,
goto error; sizeof(*savestate_name_auto));
if (global)
fill_pathname_noext(savestate_name_auto, global->name.savestate, fill_pathname_noext(savestate_name_auto, global->name.savestate,
file_path_str(FILE_PATH_AUTO_EXTENSION), file_path_str(FILE_PATH_AUTO_EXTENSION),
savestate_name_auto_size); savestate_name_auto_size);
if (!filestream_exists(savestate_name_auto)) if (!filestream_exists(savestate_name_auto))
goto error; {
free(savestate_name_auto);
return;
}
ret = content_load_state(savestate_name_auto, false, true); ret = content_load_state(savestate_name_auto, false, true);
@ -1203,11 +1205,6 @@ static void command_event_load_auto_state(void)
RARCH_LOG("%s\n", msg); RARCH_LOG("%s\n", msg);
free(savestate_name_auto); free(savestate_name_auto);
return;
error:
free(savestate_name_auto);
} }
static void command_event_set_savestate_auto_index(void) static void command_event_set_savestate_auto_index(void)
@ -1285,7 +1282,6 @@ static bool event_init_content(void)
{ {
bool contentless = false; bool contentless = false;
bool is_inited = false; bool is_inited = false;
settings_t *settings = config_get_ptr();
content_get_status(&contentless, &is_inited); content_get_status(&contentless, &is_inited);
@ -1313,13 +1309,19 @@ static bool event_init_content(void)
msg_hash_to_str(MSG_SKIPPING_SRAM_LOAD)); msg_hash_to_str(MSG_SKIPPING_SRAM_LOAD));
/* /*
Since the operations are asynchronouse we can't guarantee users will not use auto_load_state to cheat on Since the operations are asynchronouse we can't
achievements so we forbid auto_load_state from happening if cheevos_enable and cheevos_hardcode_mode_enable guarantee users will not use auto_load_state to cheat on
are true achievements so we forbid auto_load_state from happening
if cheevos_enable and cheevos_hardcode_mode_enable
are true.
*/ */
#ifdef HAVE_CHEEVOS #ifdef HAVE_CHEEVOS
if (!settings->bools.cheevos_enable || !settings->bools.cheevos_hardcore_mode_enable) {
settings_t *settings = config_get_ptr();
if ( !settings->bools.cheevos_enable ||
!settings->bools.cheevos_hardcore_mode_enable)
command_event_load_auto_state(); command_event_load_auto_state();
}
#else #else
command_event_load_auto_state(); command_event_load_auto_state();
#endif #endif
@ -1408,31 +1410,31 @@ static bool command_event_save_auto_state(void)
bool ret = false; bool ret = false;
bool contentless = false; bool contentless = false;
bool is_inited = false; bool is_inited = false;
char *savestate_name_auto = (char*) char *savestate_name_auto = NULL;
calloc(PATH_MAX_LENGTH, sizeof(*savestate_name_auto));
size_t size_t
savestate_name_auto_size = PATH_MAX_LENGTH * sizeof(char); savestate_name_auto_size = PATH_MAX_LENGTH * sizeof(char);
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
global_t *global = global_get_ptr(); global_t *global = global_get_ptr();
if (!settings || !settings->bools.savestate_auto_save) if (!global || !settings || !settings->bools.savestate_auto_save)
goto error; return false;
if (!global)
goto error;
if (rarch_ctl(RARCH_CTL_IS_DUMMY_CORE, NULL)) if (rarch_ctl(RARCH_CTL_IS_DUMMY_CORE, NULL))
goto error; return false;
content_get_status(&contentless, &is_inited); content_get_status(&contentless, &is_inited);
if (contentless) if (contentless)
goto error; return false;
#ifdef HAVE_CHEEVOS #ifdef HAVE_CHEEVOS
/* RCHEEVOS TODO: remove OR below */ /* RCHEEVOS TODO: remove OR below */
if (cheevos_hardcore_active || rcheevos_hardcore_active) if (cheevos_hardcore_active || rcheevos_hardcore_active)
goto error; return false;
#endif #endif
savestate_name_auto = (char*)
calloc(PATH_MAX_LENGTH, sizeof(*savestate_name_auto));
fill_pathname_noext(savestate_name_auto, global->name.savestate, fill_pathname_noext(savestate_name_auto, global->name.savestate,
file_path_str(FILE_PATH_AUTO_EXTENSION), file_path_str(FILE_PATH_AUTO_EXTENSION),
savestate_name_auto_size); savestate_name_auto_size);
@ -1445,10 +1447,6 @@ static bool command_event_save_auto_state(void)
free(savestate_name_auto); free(savestate_name_auto);
return true; return true;
error:
free(savestate_name_auto);
return false;
} }
static bool command_event_save_config( static bool command_event_save_config(