diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2018-05-18 09:07:42 +0200 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2018-05-18 19:04:37 +0200 |
| commit | 26d5a981eb444acf9469853d6c4988140d20cb83 (patch) | |
| tree | 617df8b0201bce295f954a0347a993c123a5bb41 /src/nvim/os/stdpaths.c | |
| parent | e121b1dbe78cdf7ad46f493ca3a1cb83c190f719 (diff) | |
| download | rneovim-26d5a981eb444acf9469853d6c4988140d20cb83.tar.gz rneovim-26d5a981eb444acf9469853d6c4988140d20cb83.tar.bz2 rneovim-26d5a981eb444acf9469853d6c4988140d20cb83.zip | |
do not pass NULL to os_getenv
closes #8393
Diffstat (limited to 'src/nvim/os/stdpaths.c')
| -rw-r--r-- | src/nvim/os/stdpaths.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/nvim/os/stdpaths.c b/src/nvim/os/stdpaths.c index 866a005228..f6503dfdb0 100644 --- a/src/nvim/os/stdpaths.c +++ b/src/nvim/os/stdpaths.c @@ -65,7 +65,7 @@ char *stdpaths_get_xdg_var(const XDGVarType idx) const char *env_val = os_getenv(env); #ifdef WIN32 - if (env_val == NULL) { + if (env_val == NULL && xdg_defaults_env_vars[idx] != NULL) { env_val = os_getenv(xdg_defaults_env_vars[idx]); } #endif @@ -74,7 +74,7 @@ char *stdpaths_get_xdg_var(const XDGVarType idx) if (env_val != NULL) { ret = xstrdup(env_val); } else if (fallback) { - ret = (char *) expand_env_save((char_u *)fallback); + ret = (char *)expand_env_save((char_u *)fallback); } return ret; |