mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-23 00:11:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Avoid calling strcmp on nullptr

Browse source 
The function group_handler may get a nullptr as `new_group`. If that's
the case, return true, as if `new_group` was the empty string.

Also make the conversion to bool explicit when calling `strcmp`.
This commit is contained in:
Till Hofmann 2020-02-10 13:05:16 +01:00 committed by Simon Ser
parent 46561fc914
commit 0f5157668d
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
swaybar/tray/icon.c
View file

@ -89,7 +89,10 @@ static bool validate_icon_theme(struct icon_theme *theme) {
static bool group_handler(char *old_group, char *new_group, static bool group_handler(char *old_group, char *new_group,
struct icon_theme *theme) { struct icon_theme *theme) {
if (!old_group) { // first group must be "Icon Theme" if (!old_group) { // first group must be "Icon Theme"
return strcmp(new_group, "Icon Theme"); if (!new_group) {
return true;
}
return strcmp(new_group, "Icon Theme") != 0;
} }
if (strcmp(old_group, "Icon Theme") == 0) { if (strcmp(old_group, "Icon Theme") == 0) {