mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-28 19:20:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix stack-use-after-scope and a memory leak with subsystems

Browse Source
This commit is contained in:
Brad Parker 2019-04-10 18:58:53 -04:00
parent a7049b0020
commit 2bfb073b3e
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
menu/cbs/menu_cbs_ok.c
View File

@ -278,7 +278,7 @@ int generic_action_ok_displaylist_push(const char *path,
const char *label, unsigned type, size_t idx, size_t entry_idx,
unsigned action_type)
{
menu_displaylist_info_t info;
menu_displaylist_info_t info = {0};
char tmp[PATH_MAX_LENGTH];
char parent_dir[PATH_MAX_LENGTH];
enum menu_displaylist_ctl_state dl_type = DISPLAYLIST_NONE;
@ -304,7 +304,7 @@ int generic_action_ok_displaylist_push(const char *path,
string_is_equal(menu_driver, "null"))
goto end;
tmp[0] = '\0';
tmp[0] = parent_dir[0] = '\0';
menu_entries_get_last_stack(&menu_path, &menu_label, NULL, &enum_idx, NULL);
@ -542,27 +542,25 @@ int generic_action_ok_displaylist_push(const char *path,
break;
case ACTION_OK_DL_DISK_IMAGE_APPEND_LIST:
{
char game_dir[PATH_MAX_LENGTH];
filebrowser_clear_type();
strlcpy(game_dir, path_get(RARCH_PATH_CONTENT), sizeof(game_dir));
path_basedir(game_dir);
strlcpy(tmp, path_get(RARCH_PATH_CONTENT), sizeof(tmp));
path_basedir(tmp);
info.type = type;
info.directory_ptr = idx;
info_path = !string_is_empty(game_dir) ? game_dir : settings->paths.directory_menu_content;
info_path = !string_is_empty(tmp) ? tmp : settings->paths.directory_menu_content;
info_label = label;
dl_type = DISPLAYLIST_FILE_BROWSER_SELECT_FILE;
}
break;
case ACTION_OK_DL_SUBSYSTEM_ADD_LIST:
{
char game_dir[PATH_MAX_LENGTH];
filebrowser_clear_type();
if (content_get_subsystem_rom_id() > 0)
strlcpy(game_dir, content_get_subsystem_rom(content_get_subsystem_rom_id() - 1), sizeof(game_dir));
strlcpy(tmp, content_get_subsystem_rom(content_get_subsystem_rom_id() - 1), sizeof(tmp));
else
strlcpy(game_dir, path_get(RARCH_PATH_CONTENT), sizeof(game_dir));
path_basedir(game_dir);
strlcpy(tmp, path_get(RARCH_PATH_CONTENT), sizeof(tmp));
path_basedir(tmp);
if (content_get_subsystem() != type - MENU_SETTINGS_SUBSYSTEM_ADD)
content_clear_subsystem();
@ -570,7 +568,7 @@ int generic_action_ok_displaylist_push(const char *path,
filebrowser_set_type(FILEBROWSER_SELECT_FILE_SUBSYSTEM);
info.type = type;
info.directory_ptr = idx;
info_path = !string_is_empty(game_dir) ? game_dir : settings->paths.directory_menu_content;
info_path = !string_is_empty(tmp) ? tmp : settings->paths.directory_menu_content;
info_label = label;
dl_type = DISPLAYLIST_FILE_BROWSER_SELECT_FILE;
}

8
paths.c
View File

@ -256,9 +256,9 @@ void path_set_special(char **argv, unsigned num_content)
{
unsigned i;
union string_list_elem_attr attr;
struct string_list* subsystem_paths = NULL;
struct string_list *subsystem_paths = NULL;
char str[PATH_MAX_LENGTH];
global_t *global = global_get_ptr();
global_t *global = global_get_ptr();
/* First content file is the significant one. */
path_set_basename(argv[0]);
@ -297,7 +297,9 @@ void path_set_special(char **argv, unsigned num_content)
global->name.savestate);
}
}
free(subsystem_paths);
if (subsystem_paths)
string_list_free(subsystem_paths);
}
static bool path_init_subsystem(void)