(__add_to_environ): Initialize ep after we have the lock.

Avoid warning about uninitialized variable.

diff --git a/sysdeps/generic/setenv.c b/sysdeps/generic/setenv.c
index fc58e9b34630fc3e61bf17e1adf920a31409c961..29fc60c3fb33fc35977277a572fd6eb25065c6a9 100644 (file)
--- a/sysdeps/generic/setenv.c
+++ b/sysdeps/generic/setenv.c
@@ -120,17 +120,21 @@ __add_to_environ (name, value, combined, replace)
 
   LOCK;
 
+  /* We have to get the pointer now that we have the lock and not earlier
+     since another thread might have created a new environment.  */
+  ep = __environ;
+
   size = 0;
-  if (__environ != NULL)
+  if (ep != NULL)
     {
-      for (ep = __environ; *ep != NULL; ++ep)
+      for (; *ep != NULL; ++ep)
        if (!strncmp (*ep, name, namelen) && (*ep)[namelen] == '=')
          break;
        else
          ++size;
     }
 
-  if (__environ == NULL || *ep == NULL)
+  if (ep == NULL || *ep == NULL)
     {
       char **new_environ;
 #ifdef USE_TSEARCH