mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-08 12:28:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

env: invalid pointer after os_setenv() #10558

Browse Source
This commit is contained in:
erw7
2019-07-21 16:15:25 +09:00
committed by Justin M. Keyes
parent f6e779d939
commit 465a0a3c09
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/nvim/os/env.c
View File

@@ -105,6 +105,10 @@ bool os_env_exists(const char *name)
return (r == 0 || r == UV_ENOBUFS); 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) int os_setenv(const char *name, const char *value, int overwrite)
FUNC_ATTR_NONNULL_ALL FUNC_ATTR_NONNULL_ALL
{ {
@@ -121,9 +125,11 @@ int os_setenv(const char *name, const char *value, int overwrite)
} }
#endif #endif
uv_mutex_lock(&mutex); uv_mutex_lock(&mutex);
pmap_del2(envmap, name);
int r = uv_os_setenv(name, value); int r = uv_os_setenv(name, value);
assert(r != UV_EINVAL); 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) { if (r != 0) {
ELOG("uv_os_setenv(%s) failed: %d %s", name, r, uv_err_name(r)); ELOG("uv_os_setenv(%s) failed: %d %s", name, r, uv_err_name(r));
} }

2
src/nvim/tui/tui.c
View File

@@ -222,6 +222,8 @@ static void terminfo_start(UI *ui)
#ifdef WIN32 #ifdef WIN32
os_tty_guess_term(&term, data->out_fd); os_tty_guess_term(&term, data->out_fd);
os_setenv("TERM", term, 1); os_setenv("TERM", term, 1);
// Old os_getenv() pointer is invalid after os_setenv(), fetch it again.
term = os_getenv("TERM");
#endif #endif
// Set up unibilium/terminfo. // Set up unibilium/terminfo.