From dd478a768bce79bcf6c627310e2ddb473667fecc Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Mon, 10 Feb 2020 19:18:54 +0000 Subject: bugfix: env_merge didn't correctly handle variable removal --- src/libstddjb/env_merge.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/libstddjb/env_merge.c b/src/libstddjb/env_merge.c index 9129cf3..5543e08 100644 --- a/src/libstddjb/env_merge.c +++ b/src/libstddjb/env_merge.c @@ -16,7 +16,8 @@ size_t env_merge (char const **v, size_t vmax, char const *const *envp, size_t e { size_t split = str_chr(modifs + i, '=') ; size_t j = 0 ; - for (; j < vlen ; j++) if (!strncmp(modifs + i, v[j], split+1)) break ; + for (; j < vlen ; j++) + if (!strncmp(modifs + i, v[j], split) && (v[j][split] == '=')) break ; if (j < vlen) v[j] = v[--vlen] ; if (modifs[i + split]) v[vlen++] = modifs + i ; } -- cgit v1.2.3