From a9ce430ed68e49ebfd5d7d1d0ea304d2b63ab49b Mon Sep 17 00:00:00 2001 From: twinaphex Date: Thu, 20 Oct 2016 18:33:25 +0200 Subject: [PATCH] Prevent some implicit memsets --- configuration.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/configuration.c b/configuration.c index e582f093af..b022b4ee82 100644 --- a/configuration.c +++ b/configuration.c @@ -2354,9 +2354,9 @@ bool config_unload_override(void) */ bool config_load_remap(void) { - char remap_directory[PATH_MAX_LENGTH] = {0}; /* path to the directory containing retroarch.cfg (prefix) */ - char core_path[PATH_MAX_LENGTH] = {0}; /* final path for core-specific configuration (prefix+suffix) */ - char game_path[PATH_MAX_LENGTH] = {0}; /* final path for game-specific configuration (prefix+suffix) */ + char remap_directory[PATH_MAX_LENGTH]; /* path to the directory containing retroarch.cfg (prefix) */ + char core_path[PATH_MAX_LENGTH]; /* final path for core-specific configuration (prefix+suffix) */ + char game_path[PATH_MAX_LENGTH]; /* final path for game-specific configuration (prefix+suffix) */ config_file_t *new_conf = NULL; const char *core_name = NULL; const char *game_name = NULL; @@ -2378,6 +2378,8 @@ bool config_load_remap(void) if (string_is_empty(settings->directory.input_remapping)) return false; + remap_directory[0] = core_path[0] = game_path[0] = '\0'; + strlcpy(remap_directory, settings->directory.input_remapping, sizeof(remap_directory)); @@ -2477,9 +2479,9 @@ static bool check_shader_compatibility(enum file_path_enum enum_idx) bool config_load_shader_preset(void) { unsigned idx; - char shader_directory[PATH_MAX_LENGTH] = {0}; /* path to the directory containing retroarch.cfg (prefix) */ - char core_path[PATH_MAX_LENGTH] = {0}; /* final path for core-specific configuration (prefix+suffix) */ - char game_path[PATH_MAX_LENGTH] = {0}; /* final path for game-specific configuration (prefix+suffix) */ + char shader_directory[PATH_MAX_LENGTH]; /* path to the directory containing retroarch.cfg (prefix) */ + char core_path[PATH_MAX_LENGTH]; /* final path for core-specific configuration (prefix+suffix) */ + char game_path[PATH_MAX_LENGTH]; /* final path for game-specific configuration (prefix+suffix) */ const char *core_name = NULL; const char *game_name = NULL; settings_t *settings = config_get_ptr(); @@ -2500,6 +2502,8 @@ bool config_load_shader_preset(void) if (string_is_empty(settings->directory.video_shader)) return false; + shader_directory[0] = core_path[0] = game_path[0] = '\0'; + fill_pathname_join (shader_directory, settings->directory.video_shader, "presets", sizeof(shader_directory));