notgne2/tuxpaint-pencil-sharpener
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

macOS path handling is more robust

Browse source 
When looking up paths of fonts, preferences, etc., macOS searches two
places, the system paths and the user paths under $HOME.

This change handles rare scenario where HOME is not set.  If HOME is not
set, now the application just searches the system path twice instead of
searching the system path followed by going into an undefined behavior
(possibly segfault.)
This commit is contained in:
Mark Kim 2022-02-05 12:12:37 -05:00
parent 8ece611f8c
commit aa4c72d4ed
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/macos.c
View file

@ -1,7 +1,7 @@
/*
macos.c
Copyright (c) 2021
Copyright (c) 2021-2022
http://www.tuxpaint.org/
This program is free software; you can redistribute it and/or modify
@ -35,11 +35,11 @@ const char *apple_fontsPath(void)
static char *p = NULL;
if(!p) {
const char *home = getenv("HOME");
const char *home = getenv("HOME") ? getenv("HOME") : "";
p = malloc(strlen(home) + strlen(MACOS_FONTS_PATH) + 1);
if(p) sprintf(p, MACOS_FONTS_PATH, getenv("HOME"));
if(p) sprintf(p, MACOS_FONTS_PATH, home);
else perror("apple_fontsPath");
}
@ -52,11 +52,11 @@ const char *apple_preferencesPath(void)
static char *p = NULL;
if(!p) {
const char *home = getenv("HOME");
const char *home = getenv("HOME") ? getenv("HOME") : "";
p = malloc(strlen(home) + strlen(MACOS_PREFERENCES_PATH) + 1);
if(p) sprintf(p, MACOS_PREFERENCES_PATH, getenv("HOME"));
if(p) sprintf(p, MACOS_PREFERENCES_PATH, home);
else perror("apple_preferencesPath");
}
@ -75,11 +75,11 @@ const char *apple_picturesPath(void)
static char *p = NULL;
if(!p) {
const char *home = getenv("HOME");
const char *home = getenv("HOME") ? getenv("HOME") : "";
p = malloc(strlen(home) + strlen(MACOS_PICTURES_PATH) + 1);
if(p) sprintf(p, MACOS_PICTURES_PATH, getenv("HOME"));
if(p) sprintf(p, MACOS_PICTURES_PATH, home);
else perror("apple_picturesPath");
}