alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fix crash when starting without HOME

Browse source 
If HOME environment variable is not set, sway fails startup with a
segmentation fault due to null pointer dereference.

Also check calloc return value and only perform the fallback code when
really needed.

Signed-off-by: Tobias Stoeckmann <tobias@stoeckmann.org>
This commit is contained in:
Tobias Stoeckmann 2021-07-23 19:02:33 +02:00 committed by Simon Ser
parent c9458b9fb1
commit e7f4e50da0
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
sway/config.c
View file

@ -354,12 +354,14 @@ static char *config_path(const char *prefix, const char *config_folder) {
static char *get_config_path(void) { static char *get_config_path(void) {
char *path = NULL; char *path = NULL;
const char *home = getenv("HOME"); const char *home = getenv("HOME");
size_t size_fallback = 1 + strlen(home) + strlen("/.config"); char *config_home_fallback = NULL;
char *config_home_fallback = calloc(size_fallback, sizeof(char));
snprintf(config_home_fallback, size_fallback, "%s/.config", home);
const char *config_home = getenv("XDG_CONFIG_HOME"); const char *config_home = getenv("XDG_CONFIG_HOME");
if (config_home == NULL || config_home[0] == '\0') { if ((config_home == NULL || config_home[0] == '\0') && home != NULL) {
size_t size_fallback = 1 + strlen(home) + strlen("/.config");
config_home_fallback = calloc(size_fallback, sizeof(char));
if (config_home_fallback != NULL)
snprintf(config_home_fallback, size_fallback, "%s/.config", home);
config_home = config_home_fallback; config_home = config_home_fallback;
} }