mirrors/foot
1
0
Fork 0
mirror of https://codeberg.org/dnkl/foot.git synced 2026-05-04 06:46:48 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

config: include: handle get_user_home_dir() returning NULL

Browse source
This commit is contained in:
Daniel Eklöf 2021-07-30 14:47:45 +02:00
parent 02f0e0d912
commit 7cfa48f369
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
1 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
config.c
View file

@ -650,6 +650,13 @@ parse_section_main(const char *key, const char *value, struct config *conf,
if (value[0] == '~' && value[1] == '/') { if (value[0] == '~' && value[1] == '/') {
const char *home_dir = get_user_home_dir(); const char *home_dir = get_user_home_dir();
if (home_dir == NULL) {
LOG_AND_NOTIFY_ERRNO(
"%s:%d: [default]: include: %s: failed to expand '~'",
path, lineno, value);
return false;
}
int chars = snprintf(NULL, 0, "%s/%s", home_dir, &value[2]); int chars = snprintf(NULL, 0, "%s/%s", home_dir, &value[2]);
_include_path = malloc(chars + 1); _include_path = malloc(chars + 1);
snprintf(_include_path, chars + 1, "%s/%s", home_dir, &value[2]); snprintf(_include_path, chars + 1, "%s/%s", home_dir, &value[2]);
@ -659,7 +666,7 @@ parse_section_main(const char *key, const char *value, struct config *conf,
if (include_path[0] != '/') { if (include_path[0] != '/') {
LOG_AND_NOTIFY_ERR( LOG_AND_NOTIFY_ERR(
"%s:%d: [default]: %s: not an absolute path", "%s:%d: [default]: include: %s: not an absolute path",
path, lineno, include_path); path, lineno, include_path);
free(_include_path); free(_include_path);
return false; return false;
@ -669,7 +676,7 @@ parse_section_main(const char *key, const char *value, struct config *conf,
if (include == NULL) { if (include == NULL) {
LOG_AND_NOTIFY_ERRNO( LOG_AND_NOTIFY_ERRNO(
"%s:%d: [default]: %s: failed to open", "%s:%d: [default]: include: %s: failed to open",
path, lineno, include_path); path, lineno, include_path);
free(_include_path); free(_include_path);
return false; return false;