mirror of
https://github.com/swaywm/sway.git
synced 2024-11-13 05:54:11 +01:00
Fix memory leaks in swaybar
This commit is contained in:
parent
2ae2d09c4c
commit
695948e689
@ -191,8 +191,12 @@ static struct icon_theme *read_theme_file(char *basedir, char *theme_name) {
|
|||||||
size_t path_len = snprintf(NULL, 0, "%s/%s/index.theme", basedir,
|
size_t path_len = snprintf(NULL, 0, "%s/%s/index.theme", basedir,
|
||||||
theme_name) + 1;
|
theme_name) + 1;
|
||||||
char *path = malloc(path_len);
|
char *path = malloc(path_len);
|
||||||
|
if (!path) {
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
snprintf(path, path_len, "%s/%s/index.theme", basedir, theme_name);
|
snprintf(path, path_len, "%s/%s/index.theme", basedir, theme_name);
|
||||||
FILE *theme_file = fopen(path, "r");
|
FILE *theme_file = fopen(path, "r");
|
||||||
|
free(path);
|
||||||
if (!theme_file) {
|
if (!theme_file) {
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
@ -293,6 +297,7 @@ static list_t *load_themes_in_dir(char *basedir) {
|
|||||||
list_add(themes, theme);
|
list_add(themes, theme);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
closedir(dir);
|
||||||
return themes;
|
return themes;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -311,7 +316,9 @@ void init_themes(list_t **themes, list_t **basedirs) {
|
|||||||
struct icon_theme *theme = (*themes)->items[i];
|
struct icon_theme *theme = (*themes)->items[i];
|
||||||
list_add(theme_names, theme->name);
|
list_add(theme_names, theme->name);
|
||||||
}
|
}
|
||||||
wlr_log(WLR_DEBUG, "Loaded themes: %s", join_list(theme_names, ", "));
|
char *theme_list = join_list(theme_names, ", ");
|
||||||
|
wlr_log(WLR_DEBUG, "Loaded themes: %s", theme_list);
|
||||||
|
free(theme_list);
|
||||||
list_free(theme_names);
|
list_free(theme_names);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user