libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-11-27 02:00:41 +00:00
Code Issues Actions 65 Packages Projects Releases Wiki Activity

Make sure core_info_find is called first before using the data struct

Browse Source
This commit is contained in:
libretroadmin 2023-07-15 16:00:48 +02:00
parent 5b52dd4965
commit f39f1f6ff2
4 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
menu/cbs/menu_cbs_get_value.c
View File

@ -523,8 +523,8 @@ static void menu_action_setting_disp_set_label_core_manager_entry(
* > Note: We search core_info here instead of * > Note: We search core_info here instead of
* calling core_info_get_core_lock() since we * calling core_info_get_core_lock() since we
* don't want to perform disk access every frame */ * don't want to perform disk access every frame */
if (core_info_find(path, &core_info) && if ( core_info_find(path, &core_info)
core_info->is_locked) && core_info->is_locked)
{ {
s[0] = '['; s[0] = '[';
s[1] = '!'; s[1] = '!';
@ -780,8 +780,8 @@ static void menu_action_setting_disp_set_label_core_lock(
* > Note: We search core_info here instead of * > Note: We search core_info here instead of
* calling core_info_get_core_lock() since we * calling core_info_get_core_lock() since we
* don't want to perform disk access every frame */ * don't want to perform disk access every frame */
if (core_info_find(path, &core_info) && if ( core_info_find(path, &core_info)
core_info->is_locked) && core_info->is_locked)
strlcpy(s, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_ON), len); strlcpy(s, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_ON), len);
else else
strlcpy(s, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_OFF), len); strlcpy(s, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_OFF), len);
@ -811,9 +811,9 @@ static void menu_action_setting_disp_set_label_core_set_standalone_exempt(
* calling core_info_get_core_standalone_exempt() * calling core_info_get_core_standalone_exempt()
* since we don't want to perform disk access * since we don't want to perform disk access
* every frame */ * every frame */
if (core_info_find(path, &core_info) && if ( core_info_find(path, &core_info)
core_info->supports_no_game && && core_info->supports_no_game
core_info->is_standalone_exempt) && core_info->is_standalone_exempt)
strlcpy(s, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_ON), len); strlcpy(s, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_ON), len);
else else
strlcpy(s, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_OFF), len); strlcpy(s, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_OFF), len);

15
menu/cbs/menu_cbs_ok.c
View File

@ -7703,8 +7703,9 @@ int action_ok_core_lock(const char *path,
/* Need to fetch core name for error message */ /* Need to fetch core name for error message */
/* If core is found, use display name */ /* If core is found, use display name */
if ( core_info->display_name if (
&& core_info_find(core_path, &core_info)) core_info_find(core_path, &core_info)
&& core_info->display_name)
core_name = core_info->display_name; core_name = core_info->display_name;
/* If not, use core file name */ /* If not, use core file name */
else else
@ -7764,8 +7765,9 @@ int action_ok_core_set_standalone_exempt(const char *path,
/* Need to fetch core name for error message */ /* Need to fetch core name for error message */
/* If core is found, use display name */ /* If core is found, use display name */
if ( core_info->display_name if (
&& core_info_find(core_path, &core_info)) core_info_find(core_path, &core_info)
&& core_info->display_name)
core_name = core_info->display_name; core_name = core_info->display_name;
/* If not, use core file name */ /* If not, use core file name */
else else
@ -7814,8 +7816,9 @@ static int action_ok_core_delete(const char *path,
/* Need to fetch core name for notification */ /* Need to fetch core name for notification */
/* If core is found, use display name */ /* If core is found, use display name */
if ( core_info->display_name if (
&& core_info_find(core_path, &core_info)) core_info_find(core_path, &core_info)
&& core_info->display_name)
core_name = core_info->display_name; core_name = core_info->display_name;
/* If not, use core file name */ /* If not, use core file name */
else else

8
tasks/task_core_backup.c
View File

@ -568,8 +568,8 @@ void *task_push_core_backup(
core_info_t *core_info = NULL; core_info_t *core_info = NULL;
/* If core is found, use display name */ /* If core is found, use display name */
if (core_info_find(core_path, &core_info) && if ( core_info_find(core_path, &core_info)
core_info->display_name) && core_info->display_name)
core_name = core_info->display_name; core_name = core_info->display_name;
else else
{ {
@ -992,8 +992,8 @@ bool task_push_core_restore(const char *backup_path, const char *dir_libretro,
/* Get core name /* Get core name
* > If core is found, use display name */ * > If core is found, use display name */
if (core_info_find(core_path, &core_info) && if ( core_info_find(core_path, &core_info)
core_info->display_name) && core_info->display_name)
core_name = core_info->display_name; core_name = core_info->display_name;
else else
{ {

4
tasks/task_playlist_manager.c
View File

@ -392,8 +392,8 @@ static void pl_manager_validate_core_association(
core_info_t *core_info = NULL; core_info_t *core_info = NULL;
/* Search core info */ /* Search core info */
if (core_info_find(core_path, &core_info) && if ( core_info_find(core_path, &core_info)
!string_is_empty(core_info->display_name)) && !string_is_empty(core_info->display_name))
strlcpy(core_display_name, core_info->display_name, strlcpy(core_display_name, core_info->display_name,
sizeof(core_display_name)); sizeof(core_display_name));
else else