ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

retroarch_get_current_savefile_dir - prevent memory leak

This commit is contained in:
twinaphex 2016-05-23 14:42:22 +02:00
parent 1be1c6a6e2
commit 09b10943b2
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
retroarch.c
View File

@ -405,13 +405,16 @@ static void retroarch_set_special_paths(char **argv, unsigned num_content)
const char *retroarch_get_current_savefile_dir(void) const char *retroarch_get_current_savefile_dir(void)
{ {
global_t *global = global_get_ptr(); char* ret = NULL;
char* ret = strdup(global->name.base);
if (!string_is_empty(current_savefile_dir)) if (!string_is_empty(current_savefile_dir))
ret = current_savefile_dir; ret = current_savefile_dir;
else else
{
global_t *global = global_get_ptr();
ret = strdup(global->name.base);
path_basedir(ret); path_basedir(ret);
}
RARCH_LOG("Environ SAVE_DIRECTORY: \"%s\".\n", RARCH_LOG("Environ SAVE_DIRECTORY: \"%s\".\n",
ret); ret);
@ -429,11 +432,13 @@ static void retroarch_set_paths_redirect(const char *path)
rarch_system_info_t *info = NULL; rarch_system_info_t *info = NULL;
runloop_ctl(RUNLOOP_CTL_SYSTEM_INFO_GET, &info); runloop_ctl(RUNLOOP_CTL_SYSTEM_INFO_GET, &info);
if (!global) if (!global)
{ {
RARCH_WARN("retroarch_set_paths_redirect was sent a NULL \"global\" pointer."); RARCH_WARN("retroarch_set_paths_redirect was sent a NULL \"global\" pointer.");
return; return;
} }
if (info->info.library_name && if (info->info.library_name &&
!string_is_empty(info->info.library_name)) !string_is_empty(info->info.library_name))
global_library_name_hash = global_library_name_hash =