ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix regression #14229 - NULL termination for strings still necessary 

when passed to string_list_join_concat
This commit is contained in:
LibretroAdmin 2022-07-27 15:15:33 +02:00
parent 9f218f923c
commit ba752b6364
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
menu/cbs/menu_cbs_sublabel.c
View File

@ -76,6 +76,7 @@ static int menu_action_sublabel_file_browser_core(file_list_t *list, unsigned ty
core_info->licenses_list) core_info->licenses_list)
{ {
char tmp[MENU_SUBLABEL_MAX_LENGTH]; char tmp[MENU_SUBLABEL_MAX_LENGTH];
tmp[0] = '\0';
/* Add license text */ /* Add license text */
string_list_join_concat(tmp, sizeof(tmp), string_list_join_concat(tmp, sizeof(tmp),
core_info->licenses_list, ", "); core_info->licenses_list, ", ");
@ -1833,6 +1834,7 @@ static int action_bind_sublabel_core_updater_entry(
entry->licenses_list) entry->licenses_list)
{ {
char tmp[MENU_SUBLABEL_MAX_LENGTH]; char tmp[MENU_SUBLABEL_MAX_LENGTH];
tmp[0] = '\0';
/* Add license text */ /* Add license text */
string_list_join_concat(tmp, sizeof(tmp), string_list_join_concat(tmp, sizeof(tmp),
entry->licenses_list, ", "); entry->licenses_list, ", ");

1
menu/menu_contentless_cores.c
View File

@ -131,6 +131,7 @@ static void contentless_cores_init_info_entries(
if (core_info->licenses_list) if (core_info->licenses_list)
{ {
char tmp_str[MENU_SUBLABEL_MAX_LENGTH - 2]; char tmp_str[MENU_SUBLABEL_MAX_LENGTH - 2];
tmp_str[0] = '\0';
string_list_join_concat(tmp_str, sizeof(tmp_str), string_list_join_concat(tmp_str, sizeof(tmp_str),
core_info->licenses_list, ", "); core_info->licenses_list, ", ");
snprintf(licenses_str, sizeof(licenses_str), "%s: %s", snprintf(licenses_str, sizeof(licenses_str), "%s: %s",