IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix potential deadlock #11151

Browse Source 
ELOG may call os_getenv and os_setenv internally. In that case, a
deadlock occurs.
This commit is contained in:
erw7 2019-10-05 00:18:24 +09:00 committed by Justin M. Keyes
parent 77a551b657
commit b4ea09cc06
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -55,6 +55,7 @@ const char *os_getenv(const char *name)
return NULL; return NULL;
} }
uv_mutex_lock(&mutex); uv_mutex_lock(&mutex);
int r = 0;
if (pmap_has(cstr_t)(envmap, name) if (pmap_has(cstr_t)(envmap, name)
&& !!(e = (char *)pmap_get(cstr_t)(envmap, name))) { && !!(e = (char *)pmap_get(cstr_t)(envmap, name))) {
if (e[0] != '\0') { if (e[0] != '\0') {
@ -67,7 +68,7 @@ const char *os_getenv(const char *name)
pmap_del2(envmap, name); pmap_del2(envmap, name);
} }
e = xmalloc(size); e = xmalloc(size);
int r = uv_os_getenv(name, e, &size); r = uv_os_getenv(name, e, &size);
if (r == UV_ENOBUFS) { if (r == UV_ENOBUFS) {
e = xrealloc(e, size); e = xrealloc(e, size);
r = uv_os_getenv(name, e, &size); r = uv_os_getenv(name, e, &size);
@ -75,14 +76,15 @@ const char *os_getenv(const char *name)
if (r != 0 || size == 0 || e[0] == '\0') { if (r != 0 || size == 0 || e[0] == '\0') {
xfree(e); xfree(e);
e = NULL; e = NULL;
if (r != 0 && r != UV_ENOENT && r != UV_UNKNOWN) {
ELOG("uv_os_getenv(%s) failed: %d %s", name, r, uv_err_name(r));
}
goto end; goto end;
} }
pmap_put(cstr_t)(envmap, xstrdup(name), e); pmap_put(cstr_t)(envmap, xstrdup(name), e);
end: end:
// Must do this before ELOG, log.c may call os_setenv.
uv_mutex_unlock(&mutex); uv_mutex_unlock(&mutex);
if (r != 0 && r != UV_ENOENT && r != UV_UNKNOWN) {
ELOG("uv_os_getenv(%s) failed: %d %s", name, r, uv_err_name(r));
}
return (e == NULL || size == 0 || e[0] == '\0') ? NULL : e; return (e == NULL || size == 0 || e[0] == '\0') ? NULL : e;
} }
@ -146,10 +148,11 @@ int os_setenv(const char *name, const char *value, int overwrite)
// Destroy the old map item. Do this AFTER uv_os_setenv(), because `value` // Destroy the old map item. Do this AFTER uv_os_setenv(), because `value`
// could be a previous os_getenv() result. // could be a previous os_getenv() result.
pmap_del2(envmap, name); pmap_del2(envmap, name);
// Must do this before ELOG, log.c may call os_setenv.
uv_mutex_unlock(&mutex);
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));
} }
uv_mutex_unlock(&mutex);
return r == 0 ? 0 : -1; return r == 0 ? 0 : -1;
} }
@ -163,10 +166,11 @@ int os_unsetenv(const char *name)
uv_mutex_lock(&mutex); uv_mutex_lock(&mutex);
pmap_del2(envmap, name); pmap_del2(envmap, name);
int r = uv_os_unsetenv(name); int r = uv_os_unsetenv(name);
// Must do this before ELOG, log.c may call os_setenv.
uv_mutex_unlock(&mutex);
if (r != 0) { if (r != 0) {
ELOG("uv_os_unsetenv(%s) failed: %d %s", name, r, uv_err_name(r)); ELOG("uv_os_unsetenv(%s) failed: %d %s", name, r, uv_err_name(r));
} }
uv_mutex_unlock(&mutex);
return r == 0 ? 0 : -1; return r == 0 ? 0 : -1;
} }