From: Jan Dubois <jand@activestate.com>
Date: Mon, 5 Feb 2007 21:45:36 +0000 (-0800)
Subject: fix 2 environment handling bugs
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=a4a109c2ec62a059b5bc094af354b4a57b9beaab;p=p5sagit%2Fp5-mst-13.2.git

fix 2 environment handling bugs
Message-ID: <p81gs2pggh04cngqjam0ejite7ksamiprt@4ax.com>

p4raw-id: //depot/perl@30147
---

diff --git a/perl.c b/perl.c
index d49278a..fa1407f 100644
--- a/perl.c
+++ b/perl.c
@@ -1556,8 +1556,10 @@ setuid perl scripts securely.\n");
 			break;
 	      }
 	 }
+
+#ifndef PERL_USE_SAFE_PUTENV
 	 /* Can we grab env area too to be used as the area for $0? */
-	 if (s && PL_origenviron) {
+	 if (s && PL_origenviron && !PL_use_safe_putenv) {
 	      if ((PL_origenviron[0] == s + 1)
 		  ||
 		  (aligned &&
@@ -1589,6 +1591,8 @@ setuid perl scripts securely.\n");
 		   }
 	      }
 	 }
+#endif /* !defined(PERL_USE_SAFE_PUTENV) */
+
 	 PL_origalen = s ? s - PL_origargv[0] + 1 : 0;
     }
 
@@ -4687,7 +4691,6 @@ S_init_postdump_symbols(pTHX_ register int argc, register char **argv, register
 	    environ[0] = NULL;
 	}
 	if (env) {
-          char** origenv = environ;
 	  char *s;
 	  SV *sv;
 	  for (; *env; env++) {
@@ -4702,11 +4705,6 @@ S_init_postdump_symbols(pTHX_ register int argc, register char **argv, register
 	    (void)hv_store(hv, *env, s - *env, sv, 0);
 	    if (env_is_not_environ)
 	        mg_set(sv);
-	    if (origenv != environ) {
-	      /* realloc has shifted us */
-	      env = (env - origenv) + environ;
-	      origenv = environ;
-	    }
 	  }
       }
 #endif /* USE_ENVIRON_ARRAY */