From dd478a768bce79bcf6c627310e2ddb473667fecc Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Mon, 10 Feb 2020 19:18:54 +0000
Subject:  bugfix: env_merge didn't correctly handle variable removal

---
 AUTHORS                   | 1 +
 src/libstddjb/env_merge.c | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/AUTHORS b/AUTHORS
index d89bd8f..424e58c 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -36,3 +36,4 @@ Thanks to:
   Johannes Nixdorf <mixi@shadowice.org>
   Casper Ti. Vector <caspervector@gmail.com>
   Guillermo <gdiazhartusch@gmail.com>
+  Alex Raschi <raschi.alex@gmail.com>
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