fix double-processing of DT_RELR relocations in ldso relocating itself

[musl] / src / env / setenv.c

diff --git a/src/env/setenv.c b/src/env/setenv.c
index 0a45896..c5226b6 100644 (file)
--- a/src/env/setenv.c
+++ b/src/env/setenv.c
@@ -2,30 +2,41 @@
 #include <string.h>
 #include <errno.h>
 
-int __putenv(char *s, int a);
+void __env_rm_add(char *old, char *new)
+{
+       static char **env_alloced;
+       static size_t env_alloced_n;
+       for (size_t i=0; i < env_alloced_n; i++)
+               if (env_alloced[i] == old) {
+                       env_alloced[i] = new;
+                       free(old);
+                       return;
+               } else if (!env_alloced[i] && new) {
+                       env_alloced[i] = new;
+                       new = 0;
+               }
+       if (!new) return;
+       char **t = realloc(env_alloced, sizeof *t * (env_alloced_n+1));
+       if (!t) return;
+       (env_alloced = t)[env_alloced_n++] = new;
+}
 
 int setenv(const char *var, const char *value, int overwrite)
 {
        char *s;
-       int l1, l2;
+       size_t l1, l2;
 
-       if (!var || !*var || strchr(var, '=')) {
+       if (!var || !(l1 = __strchrnul(var, '=') - var) || var[l1]) {
                errno = EINVAL;
                return -1;
        }
        if (!overwrite && getenv(var)) return 0;
 
-       l1 = strlen(var);
        l2 = strlen(value);
        s = malloc(l1+l2+2);
-       if (s) {
-               memcpy(s, var, l1);
-               s[l1] = '=';
-               memcpy(s+l1+1, value, l2);
-               s[l1+l2+1] = 0;
-               if (!__putenv(s, 1)) return 0;
-       }
-       free(s);
-       errno = ENOMEM;
-       return -1;
+       if (!s) return -1;
+       memcpy(s, var, l1);
+       s[l1] = '=';
+       memcpy(s+l1+1, value, l2+1);
+       return __putenv(s, l1, s);
 }