Change 19864 by [EMAIL PROTECTED] on 2003/06/27 08:18:47

        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.)

Affected files ...

... //depot/perl/perl.c#492 edit
... //depot/perl/perl.h#516 edit

Differences ...

==== //depot/perl/perl.c#492 (text) ====
Index: perl/perl.c
--- perl/perl.c#491~19863~      Fri Jun 27 01:15:11 2003
+++ perl/perl.c Fri Jun 27 01:18:47 2003
@@ -279,7 +279,7 @@
     {
        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 @@
 #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);
     }

==== //depot/perl/perl.h#516 (text) ====
Index: perl/perl.h
--- perl/perl.h#515~19863~      Fri Jun 27 01:15:11 2003
+++ perl/perl.h Fri Jun 27 01:18:47 2003
@@ -499,7 +499,7 @@
                  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 */
End of Patch.

Reply via email to