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

Validate icon_struct in read_theme_file

Browse Source 
The read_theme_file function used to return an invalid icon_struct in
some cases, for example when an empty index.theme file was read.

This makes sure the struct we're returning is always valid as per the
Icon Theme specification.

Signed-off-by: Maxime “pep” Buquet <pep@bouah.net>
This commit is contained in:
Maxime “pep” Buquet 2019-04-20 18:52:03 +01:00 committed by Brian Ashworth
parent 9099adbbe6
commit 20762ecb3c
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
swaybar/tray/icon.c
View File

@ -82,6 +82,10 @@ static int cmp_group(const void *item, const void *cmp_to) {
return strcmp(item, cmp_to); return strcmp(item, cmp_to);
} }
static bool validate_icon_theme(struct icon_theme *theme) {
return theme && theme->name && theme->comment && theme->directories;
}
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"
@ -89,7 +93,7 @@ static bool group_handler(char *old_group, char *new_group,
} }
if (strcmp(old_group, "Icon Theme") == 0) { if (strcmp(old_group, "Icon Theme") == 0) {
if (!(theme->name && theme->comment && theme->directories)) { if (!validate_icon_theme(theme)) {
return true; return true;
} }
} else { } else {
@ -276,7 +280,7 @@ static struct icon_theme *read_theme_file(char *basedir, char *theme_name) {
free(full_line); free(full_line);
fclose(theme_file); fclose(theme_file);
if (!error) { if (!error && validate_icon_theme(theme)) {
theme->dir = strdup(theme_name); theme->dir = strdup(theme_name);
return theme; return theme;
} else { } else {