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

Prevent implicit memsets

Browse Source
This commit is contained in:
twinaphex 2016-10-09 09:05:41 +02:00
parent 80339014a5
commit d078df7a37
4 changed files with 60 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
configuration.c
View File

@ -1340,6 +1340,9 @@ static void config_set_defaults(void)
if (!string_is_empty(g_defaults.path.config))
{
char temp_str[PATH_MAX_LENGTH];
temp_str[0] = '\0';
fill_pathname_expand_special(temp_str,
g_defaults.path.config, sizeof(temp_str));
path_set(RARCH_PATH_CONFIG, temp_str);
@ -1733,9 +1736,11 @@ static bool config_load_file(const char *path, bool set_defaults,
{
/* Don't destroy append_config_path, store in temporary
* variable. */
char tmp_append_path[PATH_MAX_LENGTH] = {0};
char tmp_append_path[PATH_MAX_LENGTH];
const char *extra_path = NULL;
tmp_append_path[0] = '\0';
strlcpy(tmp_append_path, path_get(RARCH_PATH_CONFIG_APPEND),
sizeof(tmp_append_path));
extra_path = strtok_r(tmp_append_path, "|", &save);
@ -1817,7 +1822,9 @@ static bool config_load_file(const char *path, bool set_defaults,
#ifdef HAVE_NETWORKGAMEPAD
for (i = 0; i < MAX_USERS; i++)
{
char tmp[64] = {0};
char tmp[64];
tmp[0] = '\0';
snprintf(tmp, sizeof(tmp), "network_remote_enable_user_p%u", i + 1);
@ -1836,7 +1843,9 @@ static bool config_load_file(const char *path, bool set_defaults,
}
}
{
char tmp[64] = {0};
char tmp[64];
tmp[0] = '\0';
strlcpy(tmp, "perfcnt_enable", sizeof(tmp));
if (config_get_bool(conf, tmp, &tmp_bool))
@ -1867,7 +1876,10 @@ static bool config_load_file(const char *path, bool set_defaults,
#endif
for (i = 0; i < MAX_USERS; i++)
{
char buf[64] = {0};
char buf[64];
buf[0] = '\0';
snprintf(buf, sizeof(buf), "input_player%u_joypad_index", i + 1);
CONFIG_GET_INT_BASE(conf, settings, input.joypad_map[i], buf);
@ -2598,8 +2610,10 @@ static void parse_config_file(void)
static void save_keybind_key(config_file_t *conf, const char *prefix,
const char *base, const struct retro_keybind *bind)
{
char key[64] = {0};
char btn[64] = {0};
char key[64];
char btn[64];
key[0] = btn[0] = '\0';
fill_pathname_join_delim(key, prefix, base, '_', sizeof(key));
@ -2610,10 +2624,12 @@ static void save_keybind_key(config_file_t *conf, const char *prefix,
static void save_keybind_hat(config_file_t *conf, const char *key,
const struct retro_keybind *bind)
{
char config[16] = {0};
char config[16];
unsigned hat = GET_HAT(bind->joykey);
const char *dir = NULL;
config[0] = '\0';
switch (GET_HAT_DIR(bind->joykey))
{
case HAT_UP_MASK:
@ -2644,7 +2660,9 @@ static void save_keybind_hat(config_file_t *conf, const char *key,
static void save_keybind_joykey(config_file_t *conf, const char *prefix,
const char *base, const struct retro_keybind *bind, bool save_empty)
{
char key[64] = {0};
char key[64];
key[0] = '\0';
fill_pathname_join_delim_concat(key, prefix,
base, '_', "_btn", sizeof(key));
@ -2663,10 +2681,12 @@ static void save_keybind_joykey(config_file_t *conf, const char *prefix,
static void save_keybind_axis(config_file_t *conf, const char *prefix,
const char *base, const struct retro_keybind *bind, bool save_empty)
{
char key[64] = {0};
char key[64];
unsigned axis = 0;
char dir = '\0';
key[0] = '\0';
fill_pathname_join_delim_concat(key,
prefix, base, '_',
"_axis",
@ -2690,7 +2710,10 @@ static void save_keybind_axis(config_file_t *conf, const char *prefix,
if (dir)
{
char config[16] = {0};
char config[16];
config[0] = '\0';
snprintf(config, sizeof(config), "%c%u", dir, axis);
config_set_string(conf, key, config);
}
@ -2802,18 +2825,22 @@ static bool config_save_keybinds_file(const char *path)
bool config_save_autoconf_profile(const char *path, unsigned user)
{
unsigned i;
char buf[PATH_MAX_LENGTH];
char autoconf_file[PATH_MAX_LENGTH];
bool ret = false;
char buf[PATH_MAX_LENGTH] = {0};
char autoconf_file[PATH_MAX_LENGTH] = {0};
config_file_t *conf = NULL;
settings_t *settings = config_get_ptr();
buf[0] = autoconf_file[0] = '\0';
fill_pathname_join(buf, settings->directory.autoconfig,
settings->input.joypad_driver, sizeof(buf));
if(path_is_directory(buf))
{
char buf_new[PATH_MAX_LENGTH] = {0};
char buf_new[PATH_MAX_LENGTH];
buf_new[0] = '\0';
fill_pathname_join(buf_new, buf,
path, sizeof(buf_new));
@ -2941,7 +2968,9 @@ bool config_save_file(const char *path)
for (i = 0; i < MAX_USERS; i++)
{
char cfg[64] = {0};
char cfg[64];
cfg[0] = '\0';
snprintf(cfg, sizeof(cfg), "input_device_p%u", i + 1);
config_set_int(conf, cfg, settings->input.device[i]);
@ -2961,7 +2990,10 @@ bool config_save_file(const char *path)
#ifdef HAVE_NETWORKGAMEPAD
for (i = 0; i < MAX_USERS; i++)
{
char tmp[64] = {0};
char tmp[64];
tmp[0] = '\0';
snprintf(tmp, sizeof(tmp), "network_remote_enable_user_p%u", i + 1);
config_set_bool(conf, tmp, settings->network_remote_enable_user[i]);
}

4
driver.c
View File

@ -143,7 +143,9 @@ static const void *find_driver_nonempty(const char *label, int i,
static int driver_find_index(const char * label, const char *drv)
{
unsigned i;
char str[256] = {0};
char str[256];
str[0] = '\0';
for (i = 0;
find_driver_nonempty(label, i, str, sizeof(str)) != NULL; i++)

8
runloop.c
View File

@ -358,7 +358,9 @@ static void runloop_check_fast_forward_button(bool fastforward_pressed,
static void runloop_check_stateslots(settings_t *settings,
bool pressed_increase, bool pressed_decrease)
{
char msg[128] = {0};
char msg[128];
msg[0] = '\0';
/* Save state slots */
if (pressed_increase)
@ -389,7 +391,9 @@ static void runloop_check_stateslots(settings_t *settings,
**/
static bool rarch_game_specific_options(char **output)
{
char game_path[PATH_MAX_LENGTH] = {0};
char game_path[PATH_MAX_LENGTH];
game_path[0] ='\0';
if (!retroarch_validate_game_options(game_path,
sizeof(game_path), false))

5
verbosity.c
View File

@ -136,7 +136,10 @@ static aslclient asl_client;
#endif
#elif defined(_XBOX1)
/* FIXME: Using arbitrary string as fmt argument is unsafe. */
char msg_new[1024], buffer[1024];
char msg_new[1024];
char buffer[1024];
msg_new[0] = buffer[0] = '\0';
snprintf(msg_new, sizeof(msg_new), "%s: %s %s",
file_path_str(FILE_PATH_PROGRAM_NAME),
tag ? tag : "",