From 17c715748d237af3d81148d9ca6c75e167ab17bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Higor=20Eur=C3=ADpedes?= Date: Wed, 12 Nov 2014 13:14:44 -0300 Subject: [PATCH 1/2] (driver.c) Fix invalid write --- driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/driver.c b/driver.c index c0d564696a..4cbc53fd18 100644 --- a/driver.c +++ b/driver.c @@ -219,7 +219,7 @@ const char* config_get_input_driver_options(void) input_options[offset] = '|'; offset += 1; } - input_options[input_options_len] = '\0'; + input_options[input_options_len - 1] = '\0'; return input_options; } From 8a84cd527851028186f64b31b1b4a1b97debef7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Higor=20Eur=C3=ADpedes?= Date: Wed, 12 Nov 2014 13:46:16 -0300 Subject: [PATCH 2/2] (settings_data) Make sure all action setting fields are initialized --- settings_data.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/settings_data.c b/settings_data.c index 09ca242c4d..eb42ed7826 100644 --- a/settings_data.c +++ b/settings_data.c @@ -989,9 +989,7 @@ rarch_setting_t setting_data_action_setting(const char* name, const char* short_description, const char *group, const char *subgroup) { - rarch_setting_t result; - result.type = ST_ACTION; - result.name = name; + rarch_setting_t result = { ST_ACTION, name }; result.short_description = short_description; result.group = group; result.subgroup = subgroup;