skalibs

commit fd7dc9d1d7311b05e92464de1fc4eab6f2407b51
parent 7e1e6cf1584c5f1c0d6c892d013ed522fb8a8bc1
Author: Laurent Bercot <ska-skaware@skarnet.org>
Date:   Thu, 11 Jul 2019 17:57:27 +0000

 bugfix: memcmp doesn't guarantee not touching bytes after cmp fails.

Diffstat:
M
AUTHORS
 | 
1
+
M
src/libstddjb/env_merge.c
 | 
3
+--

2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/AUTHORS b/AUTHORS
@@ -33,3 +33,4 @@ Thanks to:
   Éric Le Bihan <eric.le.bihan.dev@free.fr>
   Samuel Holland <samuel@sholland.org>
   Jan Bramkamp <crest_maintainer@rlwinm.de>
+  Johannes Nixdorf <mixi@shadowice.org>
diff --git a/src/libstddjb/env_merge.c b/src/libstddjb/env_merge.c
@@ -16,8 +16,7 @@ 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 (!memcmp(modifs + i, v[j], split) && (v[j][split] == '=')) break ;
+    for (; j < vlen ; j++) if (!strncmp(modifs + i, v[j], split+1)) break ;
     if (j < vlen) v[j] = v[--vlen] ;
     if (modifs[i + split]) v[vlen++] = modifs + i ;
   }