From ba752b6364b212161da61dfeea20605eaab103e6 Mon Sep 17 00:00:00 2001 From: LibretroAdmin Date: Wed, 27 Jul 2022 15:15:33 +0200 Subject: [PATCH] Fix regression #14229 - NULL termination for strings still necessary when passed to string_list_join_concat --- menu/cbs/menu_cbs_sublabel.c | 2 ++ menu/menu_contentless_cores.c | 1 + 2 files changed, 3 insertions(+) diff --git a/menu/cbs/menu_cbs_sublabel.c b/menu/cbs/menu_cbs_sublabel.c index fa3956ef45..4bf7b60518 100644 --- a/menu/cbs/menu_cbs_sublabel.c +++ b/menu/cbs/menu_cbs_sublabel.c @@ -76,6 +76,7 @@ static int menu_action_sublabel_file_browser_core(file_list_t *list, unsigned ty core_info->licenses_list) { char tmp[MENU_SUBLABEL_MAX_LENGTH]; + tmp[0] = '\0'; /* Add license text */ string_list_join_concat(tmp, sizeof(tmp), core_info->licenses_list, ", "); @@ -1833,6 +1834,7 @@ static int action_bind_sublabel_core_updater_entry( entry->licenses_list) { char tmp[MENU_SUBLABEL_MAX_LENGTH]; + tmp[0] = '\0'; /* Add license text */ string_list_join_concat(tmp, sizeof(tmp), entry->licenses_list, ", "); diff --git a/menu/menu_contentless_cores.c b/menu/menu_contentless_cores.c index 5734d98575..2dedf398d6 100644 --- a/menu/menu_contentless_cores.c +++ b/menu/menu_contentless_cores.c @@ -131,6 +131,7 @@ static void contentless_cores_init_info_entries( if (core_info->licenses_list) { char tmp_str[MENU_SUBLABEL_MAX_LENGTH - 2]; + tmp_str[0] = '\0'; string_list_join_concat(tmp_str, sizeof(tmp_str), core_info->licenses_list, ", "); snprintf(licenses_str, sizeof(licenses_str), "%s: %s",