Merge pull request #1240 from heuripedes/mem-fixes

Mem fixes
This commit is contained in:
Twinaphex 2014-11-12 17:54:48 +01:00
commit a56fc9d329
2 changed files with 2 additions and 4 deletions

View File

@ -219,7 +219,7 @@ const char* config_get_input_driver_options(void)
input_options[offset] = '|'; input_options[offset] = '|';
offset += 1; offset += 1;
} }
input_options[input_options_len] = '\0'; input_options[input_options_len - 1] = '\0';
return input_options; return input_options;
} }

View File

@ -989,9 +989,7 @@ rarch_setting_t setting_data_action_setting(const char* name,
const char* short_description, const char* short_description,
const char *group, const char *subgroup) const char *group, const char *subgroup)
{ {
rarch_setting_t result; rarch_setting_t result = { ST_ACTION, name };
result.type = ST_ACTION;
result.name = name;
result.short_description = short_description; result.short_description = short_description;
result.group = group; result.group = group;
result.subgroup = subgroup; result.subgroup = subgroup;