diff --git a/retroarch.c b/retroarch.c index d1d7bea578..df43a338fb 100644 --- a/retroarch.c +++ b/retroarch.c @@ -8298,9 +8298,10 @@ const char *char_list_new_special(enum string_list_type type, void *data) static void path_set_redirect(struct rarch_state *p_rarch) { - char content_dir_name[PATH_MAX_LENGTH]; - char new_savefile_dir[PATH_MAX_LENGTH]; - char new_savestate_dir[PATH_MAX_LENGTH]; + size_t path_size = PATH_MAX_LENGTH * sizeof(char); + char *content_dir_name = (char*)malloc(PATH_MAX_LENGTH * sizeof(char)); + char *new_savefile_dir = (char*)malloc(PATH_MAX_LENGTH * sizeof(char)); + char *new_savestate_dir = (char*)malloc(PATH_MAX_LENGTH * sizeof(char)); global_t *global = &p_rarch->g_extern; const char *old_savefile_dir = p_rarch->dir_savefile; const char *old_savestate_dir = p_rarch->dir_savestate; @@ -8319,8 +8320,8 @@ static void path_set_redirect(struct rarch_state *p_rarch) /* Initialize current save directories * with the values from the config. */ - strlcpy(new_savefile_dir, old_savefile_dir, sizeof(new_savefile_dir)); - strlcpy(new_savestate_dir, old_savestate_dir, sizeof(new_savestate_dir)); + strlcpy(new_savefile_dir, old_savefile_dir, path_size); + strlcpy(new_savestate_dir, old_savestate_dir, path_size); /* Get content directory name, if per-content-directory * saves/states are enabled */ @@ -8328,7 +8329,7 @@ static void path_set_redirect(struct rarch_state *p_rarch) sort_savestates_by_content_enable) && !string_is_empty(p_rarch->path_main_basename)) fill_pathname_parent_dir_name(content_dir_name, - p_rarch->path_main_basename, sizeof(content_dir_name)); + p_rarch->path_main_basename, path_size); if (system && !string_is_empty(system->library_name)) { @@ -8347,7 +8348,7 @@ static void path_set_redirect(struct rarch_state *p_rarch) new_savefile_dir, old_savefile_dir, content_dir_name, - sizeof(new_savefile_dir)); + path_size); /* Append library_name to the save location */ if (sort_savefiles_enable) @@ -8355,7 +8356,7 @@ static void path_set_redirect(struct rarch_state *p_rarch) new_savefile_dir, new_savefile_dir, system->library_name, - sizeof(new_savefile_dir)); + path_size); /* If path doesn't exist, try to create it, * if everything fails revert to the original path. */ @@ -8366,7 +8367,7 @@ static void path_set_redirect(struct rarch_state *p_rarch) msg_hash_to_str(MSG_REVERTING_SAVEFILE_DIRECTORY_TO), old_savefile_dir); - strlcpy(new_savefile_dir, old_savefile_dir, sizeof(new_savefile_dir)); + strlcpy(new_savefile_dir, old_savefile_dir, path_size); } } @@ -8380,7 +8381,7 @@ static void path_set_redirect(struct rarch_state *p_rarch) new_savestate_dir, old_savestate_dir, content_dir_name, - sizeof(new_savestate_dir)); + path_size); /* Append library_name to the savestate location */ if (sort_savestates_enable) @@ -8389,7 +8390,7 @@ static void path_set_redirect(struct rarch_state *p_rarch) new_savestate_dir, new_savestate_dir, system->library_name, - sizeof(new_savestate_dir)); + path_size); } /* If path doesn't exist, try to create it. @@ -8402,7 +8403,7 @@ static void path_set_redirect(struct rarch_state *p_rarch) old_savestate_dir); strlcpy(new_savestate_dir, old_savestate_dir, - sizeof(new_savestate_dir)); + path_size); } } } @@ -8412,7 +8413,7 @@ static void path_set_redirect(struct rarch_state *p_rarch) if (string_is_empty(new_savefile_dir) || savefiles_in_content_dir) { strlcpy(new_savefile_dir, p_rarch->path_main_basename, - sizeof(new_savefile_dir)); + path_size); path_basedir(new_savefile_dir); if (string_is_empty(new_savefile_dir)) @@ -8427,7 +8428,7 @@ static void path_set_redirect(struct rarch_state *p_rarch) if (string_is_empty(new_savestate_dir) || savestates_in_content_dir) { strlcpy(new_savestate_dir, p_rarch->path_main_basename, - sizeof(new_savestate_dir)); + path_size); path_basedir(new_savestate_dir); if (string_is_empty(new_savestate_dir)) @@ -8497,6 +8498,9 @@ static void path_set_redirect(struct rarch_state *p_rarch) dir_set(RARCH_DIR_CURRENT_SAVEFILE, new_savefile_dir); dir_set(RARCH_DIR_CURRENT_SAVESTATE, new_savestate_dir); + free(content_dir_name); + free(new_savefile_dir); + free(new_savestate_dir); } static void path_set_basename( @@ -8627,8 +8631,12 @@ static bool path_init_subsystem(struct rarch_state *p_rarch) { char ext[32]; union string_list_elem_attr attr; - char savename[PATH_MAX_LENGTH]; - char path[PATH_MAX_LENGTH]; + size_t path_size = + PATH_MAX_LENGTH * sizeof(char); + char *savename = + (char*)malloc(PATH_MAX_LENGTH * sizeof(char)); + char *path = + (char*)malloc(PATH_MAX_LENGTH * sizeof(char)); const struct retro_subsystem_memory_info *mem = (const struct retro_subsystem_memory_info*) &info->roms[i].memory[j]; @@ -8639,7 +8647,7 @@ static bool path_init_subsystem(struct rarch_state *p_rarch) strlcat(ext, mem->extension, sizeof(ext)); strlcpy(savename, p_rarch->subsystem_fullpaths->elems[i].data, - sizeof(savename)); + path_size); path_remove_extension(savename); if (path_is_directory(savefile_dir)) @@ -8647,10 +8655,10 @@ static bool path_init_subsystem(struct rarch_state *p_rarch) /* Use SRAM dir */ /* Redirect content fullpath to save directory. */ strlcpy(path, savefile_dir, sizeof(path)); - fill_pathname_dir(path, savename, ext, sizeof(path)); + fill_pathname_dir(path, savename, ext, path_size); } else - fill_pathname(path, savename, ext, sizeof(path)); + fill_pathname(path, savename, ext, path_size); RARCH_LOG("%s \"%s\".\n", msg_hash_to_str(MSG_REDIRECTING_SAVEFILE_TO), @@ -8659,6 +8667,8 @@ static bool path_init_subsystem(struct rarch_state *p_rarch) attr.i = mem->type; string_list_append((struct string_list*)savefile_ptr_get(), path, attr); + free(savename); + free(path); } } } @@ -9443,18 +9453,26 @@ void dir_check_defaults(void) for (i = 0; i < DEFAULT_DIR_LAST; i++) { - char new_path[PATH_MAX_LENGTH]; + char *new_path = NULL; const char *dir_path = g_defaults.dirs[i]; if (string_is_empty(dir_path)) continue; + new_path = (char*)malloc(PATH_MAX_LENGTH * sizeof(char)); + + if (!new_path) + continue; + new_path[0] = '\0'; fill_pathname_expand_special(new_path, - dir_path, sizeof(new_path)); + dir_path, + PATH_MAX_LENGTH * sizeof(char)); if (!path_is_directory(new_path)) path_mkdir(new_path); + + free(new_path); } } @@ -12436,32 +12454,35 @@ static bool command_event_save_core_config( const char *dir_menu_config) { char msg[128]; - char config_name[PATH_MAX_LENGTH]; - char config_path[PATH_MAX_LENGTH]; - char config_dir[PATH_MAX_LENGTH]; + size_t path_size = PATH_MAX_LENGTH * sizeof(char); bool found_path = false; bool overrides_active = false; const char *core_path = NULL; - + char *config_name = (char*)malloc(PATH_MAX_LENGTH * sizeof(char)); + char *config_path = (char*)malloc(PATH_MAX_LENGTH * sizeof(char)); + char *config_dir = (char*)malloc(PATH_MAX_LENGTH * sizeof(char)); msg[0] = '\0'; + config_name[0] = '\0'; + config_path[0] = '\0'; config_dir[0] = '\0'; if (!string_is_empty(dir_menu_config)) - strlcpy(config_dir, dir_menu_config, sizeof(config_dir)); + strlcpy(config_dir, dir_menu_config, path_size); else if (!path_is_empty(RARCH_PATH_CONFIG)) /* Fallback */ fill_pathname_basedir(config_dir, path_get(RARCH_PATH_CONFIG), - sizeof(config_dir)); + path_size); if (string_is_empty(config_dir)) { runloop_msg_queue_push(msg_hash_to_str(MSG_CONFIG_DIRECTORY_NOT_SET), 1, 180, true, NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO); RARCH_ERR("[config] %s\n", msg_hash_to_str(MSG_CONFIG_DIRECTORY_NOT_SET)); + free(config_dir); + free(config_name); + free(config_path); return false; } core_path = path_get(RARCH_PATH_CORE); - config_name[0] = '\0'; - config_path[0] = '\0'; /* Infer file name based on libretro core. */ if (path_is_valid(core_path)) @@ -12477,16 +12498,16 @@ static bool command_event_save_core_config( fill_pathname_base_noext( config_name, core_path, - sizeof(config_name)); + path_size); fill_pathname_join(config_path, config_dir, config_name, - sizeof(config_path)); + path_size); if (i) snprintf(tmp, sizeof(tmp), "-%u", i); strlcat(tmp, ".cfg", sizeof(tmp)); - strlcat(config_path, tmp, sizeof(config_path)); + strlcat(config_path, tmp, path_size); if (!path_is_valid(config_path)) { @@ -12501,9 +12522,9 @@ static bool command_event_save_core_config( /* Fallback to system time... */ RARCH_WARN("[config] %s\n", msg_hash_to_str(MSG_CANNOT_INFER_NEW_CONFIG_PATH)); - fill_dated_filename(config_name, ".cfg", sizeof(config_name)); + fill_dated_filename(config_name, ".cfg", path_size); fill_pathname_join(config_path, config_dir, config_name, - sizeof(config_path)); + path_size); } if (p_rarch->runloop_overrides_active) @@ -12524,6 +12545,10 @@ static bool command_event_save_core_config( p_rarch->runloop_overrides_active = overrides_active; + free(config_dir); + free(config_name); + free(config_path); + return true; } @@ -12627,7 +12652,8 @@ static bool command_event_main_state( { retro_ctx_size_info_t info; char msg[128]; - char state_path[16384]; + size_t state_path_size = 16384 * sizeof(char); + char *state_path = (char*)malloc(state_path_size); const global_t *global = &p_rarch->g_extern; settings_t *settings = p_rarch->configuration_settings; bool ret = false; @@ -12641,13 +12667,13 @@ static bool command_event_main_state( const char *name_savestate = global->name.savestate; if (state_slot > 0) - snprintf(state_path, sizeof(state_path), "%s%d", + snprintf(state_path, state_path_size, "%s%d", name_savestate, state_slot); else if (state_slot < 0) fill_pathname_join_delim(state_path, - name_savestate, "auto", '.', sizeof(state_path)); + name_savestate, "auto", '.', state_path_size); else - strlcpy(state_path, name_savestate, sizeof(state_path)); + strlcpy(state_path, name_savestate, state_path_size); } core_serialize_size(&info); @@ -12710,6 +12736,7 @@ static bool command_event_main_state( if (!string_is_empty(msg)) RARCH_LOG("%s\n", msg); + free(state_path); return ret; } @@ -16710,14 +16737,17 @@ static bool rarch_environment_cb(unsigned cmd, void *data) const char *fullpath = path_get(RARCH_PATH_CONTENT); if (!string_is_empty(fullpath)) { - char temp_path[PATH_MAX_LENGTH]; + size_t path_size = PATH_MAX_LENGTH * sizeof(char); + char *temp_path = (char*)malloc(PATH_MAX_LENGTH + * sizeof(char)); temp_path[0] = '\0'; if (string_is_empty(dir_system)) RARCH_WARN("SYSTEM DIR is empty, assume CONTENT DIR %s\n", fullpath); - fill_pathname_basedir(temp_path, fullpath, sizeof(temp_path)); + fill_pathname_basedir(temp_path, fullpath, path_size); dir_set(RARCH_DIR_SYSTEM, temp_path); + free(temp_path); } *(const char**)data = dir_get_ptr(RARCH_DIR_SYSTEM); @@ -27871,17 +27901,26 @@ bool audio_driver_dsp_filter_init(const char *device) struct rarch_state *p_rarch = &rarch_st; struct string_list *plugs = NULL; #if defined(HAVE_DYLIB) && !defined(HAVE_FILTERS_BUILTIN) - char basedir[PATH_MAX_LENGTH]; - char ext_name[PATH_MAX_LENGTH]; + char *basedir = (char*) + calloc(PATH_MAX_LENGTH, sizeof(*basedir)); + char *ext_name = (char*) + calloc(PATH_MAX_LENGTH, sizeof(*ext_name)); + size_t str_size = PATH_MAX_LENGTH * sizeof(char); basedir[0] = ext_name[0] = '\0'; - fill_pathname_basedir(basedir, device, sizeof(basedir)); + fill_pathname_basedir(basedir, device, str_size); - if (!frontend_driver_get_core_extension(ext_name, sizeof(ext_name))) + if (!frontend_driver_get_core_extension(ext_name, str_size)) + { + free(ext_name); + free(basedir); return false; + } plugs = dir_list_new(basedir, ext_name, false, true, false, false); + free(ext_name); + free(basedir); if (!plugs) return false; #endif @@ -28309,9 +28348,7 @@ static void audio_driver_load_menu_bgm_callback(retro_task_t *task, void audio_driver_load_system_sounds(void) { - char sounds_path[PATH_MAX_LENGTH]; - char sounds_fallback_path[PATH_MAX_LENGTH]; - char basename_noext[PATH_MAX_LENGTH]; + size_t path_size = PATH_MAX_LENGTH * sizeof(char); struct rarch_state *p_rarch = &rarch_st; settings_t *settings = p_rarch->configuration_settings; const char *dir_assets = settings->paths.directory_assets; @@ -28329,23 +28366,28 @@ void audio_driver_load_system_sounds(void) struct string_list *list = NULL; struct string_list *list_fallback = NULL; unsigned i = 0; + char *sounds_path = NULL; + char *sounds_fallback_path = NULL; + char *basename_noext = NULL; if (!audio_enable_menu && !audio_enable_cheevo_unlock) goto end; - sounds_path[0] = sounds_fallback_path[0] = - basename_noext[0] ='\0'; + sounds_path = (char*)malloc(PATH_MAX_LENGTH * sizeof(char)); + sounds_fallback_path = (char*)malloc(PATH_MAX_LENGTH * sizeof(char)); + sounds_path[0] = + sounds_fallback_path[0] = '\0'; fill_pathname_join( sounds_fallback_path, dir_assets, "sounds", - sizeof(sounds_fallback_path)); + path_size); fill_pathname_application_special( sounds_path, sizeof(sounds_path), - APPLICATION_SPECIAL_DIRECTORY_ASSETS_SOUNDS); + path_size); list = dir_list_new(sounds_path, MENU_SOUND_FORMATS, false, false, false, false); list_fallback = dir_list_new(sounds_fallback_path, MENU_SOUND_FORMATS, false, false, false, false); @@ -28371,6 +28413,7 @@ void audio_driver_load_system_sounds(void) } } + basename_noext = (char*)malloc(PATH_MAX_LENGTH * sizeof(char)); for (i = 0; i < list->size; i++) { const char *path = list->elems[i].data; @@ -28379,7 +28422,7 @@ void audio_driver_load_system_sounds(void) if (audio_driver_mixer_extension_supported(ext)) { basename_noext[0] = '\0'; - fill_pathname_base_noext(basename_noext, path, sizeof(basename_noext)); + fill_pathname_base_noext(basename_noext, path, path_size); if (string_is_equal_noncase(basename_noext, "ok")) path_ok = path; @@ -28410,6 +28453,12 @@ end: string_list_free(list); if (list_fallback) string_list_free(list_fallback); + if (sounds_path) + free(sounds_path); + if (sounds_fallback_path) + free(sounds_fallback_path); + if (basename_noext) + free(basename_noext); } void audio_driver_mixer_play_stream(unsigned i) @@ -34317,11 +34366,13 @@ static bool retroarch_validate_per_core_options(char *s, size_t len, bool mkdir, const char *core_name, const char *game_name) { - char config_directory[PATH_MAX_LENGTH]; + char *config_directory = NULL; + size_t str_size = PATH_MAX_LENGTH * sizeof(char); + config_directory = (char*)malloc(str_size); config_directory[0] = '\0'; fill_pathname_application_special(config_directory, - sizeof(config_directory), APPLICATION_SPECIAL_DIRECTORY_CONFIG); + str_size, APPLICATION_SPECIAL_DIRECTORY_CONFIG); fill_pathname_join_special_ext(s, config_directory, core_name, game_name, @@ -34330,14 +34381,16 @@ static bool retroarch_validate_per_core_options(char *s, /* No need to make a directory if file already exists... */ if (mkdir && !path_is_valid(s)) { - char new_path[PATH_MAX_LENGTH]; + char *new_path = (char*)malloc(str_size); new_path[0] = '\0'; fill_pathname_join(new_path, - config_directory, core_name, sizeof(new_path)); + config_directory, core_name, str_size); if (!path_is_directory(new_path)) path_mkdir(new_path); + + free(new_path); } return true; @@ -35495,13 +35548,23 @@ static bool retroarch_load_shader_preset(struct rarch_state *p_rarch) const char *rarch_path_basename = path_get(RARCH_PATH_BASENAME); const char *game_name = path_basename(rarch_path_basename); + char *config_file_directory = NULL; + char *old_presets_directory = NULL; const char *dirs[3] = {0}; size_t i = 0; bool ret = false; - char content_dir_name[PATH_MAX_LENGTH]; - char config_file_directory[PATH_MAX_LENGTH]; - char old_presets_directory[PATH_MAX_LENGTH]; + char *content_dir_name = (char*)malloc(PATH_MAX_LENGTH); + if (!content_dir_name) + return false; + + config_file_directory = (char*)malloc(PATH_MAX_LENGTH); + if (!config_file_directory) + goto end; + + old_presets_directory = (char*)malloc(PATH_MAX_LENGTH); + if (!old_presets_directory) + goto end; content_dir_name[0] = '\0'; config_file_directory[0] = '\0'; @@ -35509,19 +35572,19 @@ static bool retroarch_load_shader_preset(struct rarch_state *p_rarch) if (!string_is_empty(rarch_path_basename)) fill_pathname_parent_dir_name(content_dir_name, - rarch_path_basename, sizeof(content_dir_name)); + rarch_path_basename, PATH_MAX_LENGTH); config_file_directory[0] = '\0'; if (!path_is_empty(RARCH_PATH_CONFIG)) fill_pathname_basedir(config_file_directory, - path_get(RARCH_PATH_CONFIG), sizeof(config_file_directory)); + path_get(RARCH_PATH_CONFIG), PATH_MAX_LENGTH); old_presets_directory[0] = '\0'; if (!string_is_empty(video_shader_directory)) fill_pathname_join(old_presets_directory, - video_shader_directory, "presets", sizeof(old_presets_directory)); + video_shader_directory, "presets", PATH_MAX_LENGTH); dirs[0] = menu_config_directory; dirs[1] = config_file_directory; @@ -35585,6 +35648,14 @@ static bool retroarch_load_shader_preset(struct rarch_state *p_rarch) } } +end: + if (content_dir_name) + free(content_dir_name); + if (config_file_directory) + free(config_file_directory); + if (old_presets_directory) + free(old_presets_directory); + return ret; } #endif diff --git a/tasks/task_content.c b/tasks/task_content.c index c7aaf0df01..1b7bae534c 100644 --- a/tasks/task_content.c +++ b/tasks/task_content.c @@ -958,8 +958,9 @@ static bool content_file_load( char* buf; int64_t len; union string_list_elem_attr attr; - char new_basedir[PATH_MAX_LENGTH]; - char new_path[PATH_MAX_LENGTH]; + size_t path_size = PATH_MAX_LENGTH * sizeof(char); + char *new_basedir = (char*)malloc(path_size); + char *new_path = (char*)malloc(path_size); new_path[0] = '\0'; new_basedir[0] = '\0'; @@ -968,7 +969,8 @@ static bool content_file_load( RARCH_LOG("[CONTENT LOAD]: Core does not support VFS - copying to cache directory\n"); if (!string_is_empty(content_ctx->directory_cache)) - strlcpy(new_basedir, content_ctx->directory_cache, sizeof(new_basedir)); + strlcpy(new_basedir, content_ctx->directory_cache, + path_size); if ( string_is_empty(new_basedir) || !path_is_directory(new_basedir) || !is_path_accessible_using_standard_io(new_basedir)) @@ -978,11 +980,12 @@ static bool content_file_load( "cache directory was not set or found. " "Setting cache directory to root of " "writable app directory...\n"); - strlcpy(new_basedir, uwp_dir_data, sizeof(new_basedir)); + strlcpy(new_basedir, uwp_dir_data, path_size); } fill_pathname_join(new_path, new_basedir, - path_basename(path), sizeof(new_path)); + path_basename(path), path_size); + free(new_basedir); /* TODO: This may fail on very large files... * but copying large files is not a good idea anyway */ @@ -997,6 +1000,7 @@ static bool content_file_load( msg_hash_to_str(MSG_COULD_NOT_READ_CONTENT_FILE), path); *error_string = strdup(msg); + free(new_path); return false; } @@ -1012,6 +1016,7 @@ static bool content_file_load( msg_hash_to_str(MSG_COULD_NOT_READ_CONTENT_FILE), path); *error_string = strdup(msg); + free(new_path); return false; } @@ -1024,6 +1029,7 @@ static bool content_file_load( string_list_append(content_ctx->temporary_content, new_path, attr); + free(new_path); used_vfs_fallback_copy = true; } #endif