Browse Source

Merge pull request #1389 from aswild/getenv-segfault

options: fix segfault when TERM or HOME isn't set
pull/1393/head
Geoff Greer 8 months ago
committed by GitHub
parent
commit
5600c1b6b1
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 2 deletions
  1. +4
    -2
      src/options.c
  2. +9
    -0
      tests/empty_environment.t

+ 4
- 2
src/options.c View File

@ -150,7 +150,7 @@ void init_options(void) {
memset(&opts, 0, sizeof(opts));
opts.casing = CASE_DEFAULT;
opts.color = TRUE;
if (strcmp(term, "dumb") == 0) {
if (term && !strcmp(term, "dumb")) {
opts.color = FALSE;
}
opts.color_win_ansi = FALSE;
@ -713,8 +713,10 @@ void parse_options(int argc, char **argv, char **base_paths[], char **paths[]) {
const char *config_home = getenv("XDG_CONFIG_HOME");
if (config_home) {
ag_asprintf(&gitconfig_res, "%s/%s", config_home, "git/ignore");
} else {
} else if (home_dir) {
ag_asprintf(&gitconfig_res, "%s/%s", home_dir, ".config/git/ignore");
} else {
gitconfig_res = ag_strdup("");
}
}
log_debug("global core.excludesfile: %s", gitconfig_res);


+ 9
- 0
tests/empty_environment.t View File

@ -0,0 +1,9 @@
Setup:
$ . $TESTDIR/setup.sh
$ printf "hello world\n" >test.txt
Verify ag runs with an empty environment:
$ env -i $TESTDIR/../ag --noaffinity --nocolor --workers=1 --parallel hello
test.txt:1:hello world

Loading…
Cancel
Save