diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2019-07-11 17:57:27 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska-skaware@skarnet.org> | 2019-07-11 17:57:27 +0000 |
| commit | fd7dc9d1d7311b05e92464de1fc4eab6f2407b51 (patch) | |
| tree | 7094df343cd204f9d381a8f1f6ac4334d87876f2 | |
| parent | 7e1e6cf1584c5f1c0d6c892d013ed522fb8a8bc1 (diff) | |
| download | skalibs-fd7dc9d1d7311b05e92464de1fc4eab6f2407b51.tar.xz | |
bugfix: memcmp doesn't guarantee not touching bytes after cmp fails.
| -rw-r--r-- | AUTHORS | 1 | ||||
| -rw-r--r-- | src/libstddjb/env_merge.c | 3 |
2 files changed, 2 insertions, 2 deletions
@@ -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 index f7ba335..9129cf3 100644 --- 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 ; } |