Use the PL_earlytaint. (PL_earlytaint is a global,

not per-interp, since perl_construct() is not passed
the argc, argv, and therefore it can't set the per-interp
PL_tainting.)

p4raw-id: //depot/perl@19864

2 files changed, 3 insertions, 3 deletions

diff --git a/perl.c b/perl.c
index f40aaa56e5..badb216fec 100644
--- a/perl.c
+++ b/perl.c
@@ -279,7 +279,7 @@ perl_construct(pTHXx)
     {
        char *s = NULL;
 
-       if (!PL_tainting)
+       if (!PL_earlytaint)
 	   s = PerlEnv_getenv("PERL_HASH_SEED");
        if (s)
            while (isSPACE(*s)) s++;
@@ -301,7 +301,7 @@ perl_construct(pTHXx)
 #endif /* RANDBITS < (UVSIZE * 8) */
        }
 #endif /* USE_HASH_SEED_EXPLICIT */
-       if (!PL_tainting && (s = PerlEnv_getenv("PERL_HASH_SEED_DEBUG")))
+       if (!PL_earlytaint && (s = PerlEnv_getenv("PERL_HASH_SEED_DEBUG")))
 	   PerlIO_printf(Perl_debug_log, "HASH_SEED = %"UVuf"\n",
 			 PL_hash_seed);
     }
diff --git a/perl.h b/perl.h
index 492bd832cb..ea55630132 100644
--- a/perl.h
+++ b/perl.h
@@ -499,7 +499,7 @@ int usleep(unsigned int);
 		  panic_write2("panic: tainting with $ENV{PERL_MALLOC_OPT}\n");\
 		  exit(1); })
 #  define MALLOC_CHECK_TAINT(argc,argv,env)	STMT_START {	\
-	if (Perl_doing_taint(argc,argv,env)) {			\
+	if (PL_earlytaint)) {					\
 		MallocCfg_ptr[MallocCfg_skip_cfg_env] = 1;	\
     }} STMT_END;
 #else  /* MYMALLOC */