diff options
| author | erw7 <erw7.github@gmail.com> | 2019-07-21 16:15:25 +0900 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2019-07-23 11:45:38 +0200 |
| commit | 465a0a3c09ece20c16c08e694ec9f47aeafb47fc (patch) | |
| tree | e0aef31c417c6df9a44129cd0d01e86c30882dbb | |
| parent | f6e779d939c0d3c67496daa296b6e78ed10a92b5 (diff) | |
| download | rneovim-465a0a3c09ece20c16c08e694ec9f47aeafb47fc.tar.gz rneovim-465a0a3c09ece20c16c08e694ec9f47aeafb47fc.tar.bz2 rneovim-465a0a3c09ece20c16c08e694ec9f47aeafb47fc.zip | |
env: invalid pointer after os_setenv() #10558
| -rw-r--r-- | src/nvim/os/env.c | 8 | ||||
| -rw-r--r-- | src/nvim/tui/tui.c | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/src/nvim/os/env.c b/src/nvim/os/env.c index b067de608b..2278c325ea 100644 --- a/src/nvim/os/env.c +++ b/src/nvim/os/env.c @@ -105,6 +105,10 @@ bool os_env_exists(const char *name) return (r == 0 || r == UV_ENOBUFS); } +/// Sets an environment variable. +/// +/// @warning Existing pointers to the result of os_getenv("foo") are +/// INVALID after os_setenv("foo", …). int os_setenv(const char *name, const char *value, int overwrite) FUNC_ATTR_NONNULL_ALL { @@ -121,9 +125,11 @@ int os_setenv(const char *name, const char *value, int overwrite) } #endif uv_mutex_lock(&mutex); - pmap_del2(envmap, name); int r = uv_os_setenv(name, value); assert(r != UV_EINVAL); + // Destroy the old map item. Do this AFTER uv_os_setenv(), because `value` + // could be a previous os_getenv() result. + pmap_del2(envmap, name); if (r != 0) { ELOG("uv_os_setenv(%s) failed: %d %s", name, r, uv_err_name(r)); } diff --git a/src/nvim/tui/tui.c b/src/nvim/tui/tui.c index 307166bc41..58ef540707 100644 --- a/src/nvim/tui/tui.c +++ b/src/nvim/tui/tui.c @@ -222,6 +222,8 @@ static void terminfo_start(UI *ui) #ifdef WIN32 os_tty_guess_term(&term, data->out_fd); os_setenv("TERM", term, 1); + // Old os_getenv() pointer is invalid after os_setenv(), fetch it again. + term = os_getenv("TERM"); #endif // Set up unibilium/terminfo. |