[dummy merge]

This merge exists so that the p5p version of the patch and the applied
version are both in the history

diff --git a/util.c b/util.c
index 3b496ed..cdb64ad 100644 (file)
--- a/util.c
+++ b/util.c
@@ -1350,7 +1350,7 @@ char *nam, *val;
        environ = tmpenv;               /* tell exec where it is now */
     }
     if (!val) {
-       if (environ[i]) Safefree(environ[i]);
+       Safefree(environ[i]);
        while (environ[i]) {
            environ[i] = environ[i+1];
            i++;