Skip to content

Commit 0da5c81

Browse files
warmenhovenwarmenhoven
committed
asan
1 parent 66155ff commit 0da5c81

3 files changed

Lines changed: 38 additions & 28 deletions

File tree

‎menu/menu_displaylist.c‎

Lines changed: 24 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -3603,8 +3603,8 @@ static int menu_displaylist_parse_load_content_settings(
36033603
}
36043604

36053605
if ( settings->bools.quick_menu_show_start_streaming
3606-
&& memcmp(settings->arrays.record_driver,
3607-
"ffmpeg", STRLEN_CONST("ffmpeg")) == 0)
3606+
&& !strcmp(settings->arrays.record_driver,
3607+
"ffmpeg"))
36083608
{
36093609
if (menu_entries_append(list,
36103610
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_QUICK_MENU_START_STREAMING),
@@ -4204,8 +4204,8 @@ static unsigned menu_displaylist_parse_playlists(
42044204
const char *menu_ident = menu_driver_ident();
42054205
bool show_add_content = (settings->uints.menu_content_show_add_entry ==
42064206
MENU_ADD_CONTENT_ENTRY_DISPLAY_PLAYLISTS_TAB);
4207-
bool show_history = !(memcmp(menu_ident, "rgui", 4) == 0)
4208-
&& !(memcmp(menu_ident, "glui", 4) == 0
4207+
bool show_history = strcmp(menu_ident, "rgui") != 0
4208+
&& !((!strcmp(menu_ident, "glui"))
42094209
&& !settings->bools.menu_materialui_show_nav_bar);
42104210

42114211
if (show_history)
@@ -4686,9 +4686,8 @@ static unsigned menu_displaylist_parse_playlist_manager_list(
46864686
if (
46874687
string_ends_with_size(path, "_history.lpl",
46884688
strlen(path), STRLEN_CONST("_history.lpl"))
4689-
|| memcmp(playlist_file,
4690-
FILE_PATH_CONTENT_FAVORITES,
4691-
strlen(FILE_PATH_CONTENT_FAVORITES)) == 0)
4689+
|| !strcmp(playlist_file,
4690+
FILE_PATH_CONTENT_FAVORITES))
46924691
continue;
46934692

46944693
menu_entries_append(list, path, "",
@@ -4815,21 +4814,21 @@ static bool menu_displaylist_parse_playlist_manager_settings(
48154814

48164815
/* > Get label values */
48174816
#ifdef HAVE_RGUI
4818-
if (memcmp(menu_driver, "rgui", 4) == 0 && menu_driver[4] == '\0')
4817+
if (!strcmp(menu_driver, "rgui"))
48194818
{
48204819
right_thumbnail_label_value = MENU_ENUM_LABEL_VALUE_THUMBNAILS_RGUI;
48214820
left_thumbnail_label_value = MENU_ENUM_LABEL_VALUE_LEFT_THUMBNAILS_RGUI;
48224821
}
48234822
#endif
48244823
#ifdef HAVE_OZONE
4825-
if (memcmp(menu_driver, "ozone", 6) == 0)
4824+
if (!strcmp(menu_driver, "ozone"))
48264825
{
48274826
right_thumbnail_label_value = MENU_ENUM_LABEL_VALUE_THUMBNAILS;
48284827
left_thumbnail_label_value = MENU_ENUM_LABEL_VALUE_LEFT_THUMBNAILS_OZONE;
48294828
}
48304829
#endif
48314830
#ifdef HAVE_MATERIALUI
4832-
if (memcmp(menu_driver, "glui", 5) == 0)
4831+
if (!strcmp(menu_driver, "glui"))
48334832
{
48344833
right_thumbnail_label_value = MENU_ENUM_LABEL_VALUE_THUMBNAILS_MATERIALUI;
48354834
left_thumbnail_label_value = MENU_ENUM_LABEL_VALUE_LEFT_THUMBNAILS_MATERIALUI;
@@ -5852,7 +5851,7 @@ static int menu_displaylist_parse_input_select_physical_keyboard_list(
58525851
bool keyboard_added = false;
58535852
input_driver_state_t *st = input_state_get_ptr();
58545853
input_driver_t *current_input = st->current_driver;
5855-
bool is_android_driver = (memcmp(current_input->ident, "android", 8) == 0);
5854+
bool is_android_driver = !strcmp(current_input->ident, "android");
58565855

58575856
device_lbl[0] = '\0';
58585857

@@ -6757,7 +6756,7 @@ static unsigned menu_displaylist_populate_subsystem(
67576756
int i = 0;
67586757
#if defined(HAVE_RGUI)
67596758
const char *menu_driver = menu_driver_ident();
6760-
bool is_rgui = (memcmp(menu_driver, "rgui", 4) == 0);
6759+
bool is_rgui = !strcmp(menu_driver, "rgui");
67616760

67626761
/* Select appropriate 'star' marker for subsystem menu entries
67636762
* (i.e. RGUI does not support unicode, so use a 'standard'
@@ -7378,9 +7377,9 @@ unsigned menu_displaylist_build_list(
73787377
count++;
73797378

73807379
/* TODO/FIXME - should we dehardcode this? */
7381-
if ( memcmp(current_input->ident, "android", 8) == 0
7382-
|| (memcmp(current_input->ident, "cocoa", 6) == 0
7383-
&& memcmp(os_ver, "iOS", 4) == 0))
7380+
if ( !strcmp(current_input->ident, "android")
7381+
|| (!strcmp(current_input->ident, "cocoa")
7382+
&& !strcmp(os_ver, "iOS")))
73847383
if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list,
73857384
MENU_ENUM_LABEL_ENABLE_DEVICE_VIBRATION,
73867385
PARSE_ONLY_BOOL, false) == 0)
@@ -9551,11 +9550,11 @@ unsigned menu_displaylist_build_list(
95519550
case DISPLAYLIST_RECORDING_SETTINGS_LIST:
95529551
{
95539552
unsigned streaming_mode = settings->uints.streaming_mode;
9554-
bool is_ffmpeg = (memcmp(
9555-
settings->arrays.record_driver, "ffmpeg", 6) == 0);
9553+
bool is_ffmpeg = !strcmp(
9554+
settings->arrays.record_driver, "ffmpeg");
95569555
bool has_video = is_ffmpeg
9557-
|| memcmp(
9558-
settings->arrays.record_driver, "avfoundation", 13) == 0;
9556+
|| !strcmp(
9557+
settings->arrays.record_driver, "avfoundation");
95599558
static menu_displaylist_build_info_selective_t build_list[] = {
95609559
{MENU_ENUM_LABEL_RECORD_DRIVER, PARSE_ONLY_STRING_OPTIONS, true},
95619560
{MENU_ENUM_LABEL_VIDEO_RECORD_QUALITY, PARSE_ONLY_UINT, false},
@@ -15258,11 +15257,11 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
1525815257
&& !settings->bools.kiosk_mode_enable;
1525915258
bool show_settings = settings->bools.menu_content_show_settings
1526015259
&& !settings->bools.kiosk_mode_enable
15261-
&& ( memcmp(menu_ident, "rgui", 4) == 0
15262-
|| ( memcmp(menu_ident, "glui", 4) == 0
15260+
&& ( !strcmp(menu_ident, "rgui")
15261+
|| ( !strcmp(menu_ident, "glui")
1526315262
&& !settings->bools.menu_materialui_show_nav_bar));
1526415263

15265-
if ( memcmp(menu_ident, "glui", 4) == 0 && menu_ident[4] == '\0'
15264+
if ( !strcmp(menu_ident, "glui")
1526615265
&& settings->bools.menu_materialui_show_nav_bar
1526715266
&& settings->bools.menu_content_show_playlist_tabs)
1526815267
show_playlists = false;
@@ -15327,8 +15326,8 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
1532715326
}
1532815327

1532915328
/* Show History and Favorites in menus without sidebar/tabs */
15330-
if ( (memcmp(menu_ident, "rgui", 4) == 0)
15331-
|| ((memcmp(menu_ident, "glui", 4) == 0)
15329+
if ( !strcmp(menu_ident, "rgui")
15330+
|| (!strcmp(menu_ident, "glui")
1533215331
&& !settings->bools.menu_materialui_show_nav_bar))
1533315332
{
1533415333
if (settings->bools.menu_content_show_favorites_first)
@@ -15458,7 +15457,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
1545815457
{
1545915458
if ( !settings->bools.menu_content_show_settings
1546015459
&& !settings->bools.kiosk_mode_enable
15461-
&& !( memcmp(menu_ident, "glui", 4) == 0
15460+
&& !( !strcmp(menu_ident, "glui")
1546215461
&& settings->bools.menu_materialui_show_nav_bar)
1546315462
&& settings->paths.menu_content_show_settings_password[0] != '\0')
1546415463
if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(

‎network/discord.c‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1891,10 +1891,16 @@ void discord_update(enum presence presence)
18911891

18921892
if (!label)
18931893
label = path_basename(path_get(RARCH_PATH_BASENAME));
1894-
discord_st->presence.largeImageKey = system_id;
1894+
strlcpy(discord_st->game_image_key, system_id,
1895+
sizeof(discord_st->game_image_key));
1896+
discord_st->presence.largeImageKey = discord_st->game_image_key;
18951897

18961898
if (core_info->display_name)
1897-
discord_st->presence.largeImageText = core_info->display_name;
1899+
{
1900+
strlcpy(discord_st->game_image_text, core_info->display_name,
1901+
sizeof(discord_st->game_image_text));
1902+
discord_st->presence.largeImageText = discord_st->game_image_text;
1903+
}
18981904

18991905
discord_st->start_time = time(0);
19001906
if (discord_st->pause_time != 0)
@@ -1925,7 +1931,9 @@ void discord_update(enum presence presence)
19251931
discord_st->presence.details = msg_hash_to_str(
19261932
MENU_ENUM_LABEL_VALUE_DISCORD_IN_GAME);
19271933

1928-
discord_st->presence.state = label;
1934+
strlcpy(discord_st->game_state, label,
1935+
sizeof(discord_st->game_state));
1936+
discord_st->presence.state = discord_st->game_state;
19291937
discord_st->presence.instance = 0;
19301938

19311939
if (!netplay_driver_ctl(RARCH_NETPLAY_CTL_IS_ENABLED, NULL))

‎network/discord.h‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,9 @@ struct discord_state
132132
char cheevos_richpresence[256];
133133
char cheevos_badge_url[256];
134134
#endif
135+
char game_state[128];
136+
char game_image_key[32];
137+
char game_image_text[128];
135138

136139
bool ready;
137140
bool avatar_ready;

0 commit comments

Comments
 (0)