[GNUnet-SVN] r31185 - gnunet/src/testbed

[gnunet]

Author: LRN
Date: 2013-12-08 22:47:26 +0100 (Sun, 08 Dec 2013)
New Revision: 31185

Modified:
   gnunet/src/testbed/gnunet-helper-testbed.c
Log:
Dup the envvar before unsetting, everywhere

Modified: gnunet/src/testbed/gnunet-helper-testbed.c
===================================================================
--- gnunet/src/testbed/gnunet-helper-testbed.c  2013-12-08 21:33:38 UTC (rev 
31184)
+++ gnunet/src/testbed/gnunet-helper-testbed.c  2013-12-08 21:47:26 UTC (rev 
31185)
@@ -406,9 +406,9 @@
   evstr = getenv (GNUNET_TESTING_PREFIX);
   if (NULL != evstr)
   {
-#ifdef WINDOWS
     /* unsetting the variable will invalidate the pointer! */
     evstr = GNUNET_strdup (evstr);
+#ifdef WINDOWS
     GNUNET_break (0 != SetEnvironmentVariable (GNUNET_TESTING_PREFIX, NULL));
 #else
     GNUNET_break (0 == unsetenv (GNUNET_TESTING_PREFIX));
@@ -421,7 +421,6 @@
   {
 #ifdef WINDOWS
     GNUNET_assert (0 != SetEnvironmentVariable (GNUNET_TESTING_PREFIX, evstr));
-    GNUNET_free (evstr);
 #else
     static char evar[2* PATH_MAX];
 
@@ -429,7 +428,7 @@
                                         GNUNET_TESTING_PREFIX "=%s", evstr));
     putenv (evar);
 #endif
-    /* do not free evstr */
+    GNUNET_free (evstr);
     evstr = NULL;
   }
   GNUNET_free_non_null (hostname);