s/dXS_TARGET/dXSTARG/ in change#4044 (to match dARGS vs dXSARGS

[p5sagit/p5-mst-13.2.git] / taint.c

diff --git a/taint.c b/taint.c
index c8c6800..2a5fedc 100644 (file)
--- a/taint.c
+++ b/taint.c
@@ -5,32 +5,41 @@
  */
 
 #include "EXTERN.h"
+#define PERL_IN_TAINT_C
 #include "perl.h"
 
 void
-taint_proper(const char *f, char *s)
+Perl_taint_proper(pTHX_ const char *f, char *s)
 {
+    dTHR;      /* just for taint */
     char *ug;
 
+#ifdef IV_IS_QUAD
     DEBUG_u(PerlIO_printf(Perl_debug_log,
-            "%s %d %d %d\n", s, tainted, uid, euid));
+            "%s %d %" PERL_PRId64 " %" PERL_PRId64 "\n", s, PL_tainted, (IV)PL_uid, (IV)PL_euid));
+#else
+    DEBUG_u(PerlIO_printf(Perl_debug_log,
+            "%s %d %lu %lu\n", s, PL_tainted, (unsigned long)PL_uid, (unsigned long)PL_euid));
+#endif
 
-    if (tainted) {
-       if (euid != uid)
+    if (PL_tainted) {
+       if (!f)
+           f = PL_no_security;
+       if (PL_euid != PL_uid)
            ug = " while running setuid";
-       else if (egid != gid)
+       else if (PL_egid != PL_gid)
            ug = " while running setgid";
        else
            ug = " while running with -T switch";
-       if (!unsafe)
-           croak(f, s, ug);
-       else if (dowarn)
-           warn(f, s, ug);
+       if (!PL_unsafe)
+           Perl_croak(aTHX_ f, s, ug);
+       else if (ckWARN(WARN_TAINT))
+           Perl_warner(aTHX_ WARN_TAINT, f, s, ug);
     }
 }
 
 void
-taint_env(void)
+Perl_taint_env(pTHX)
 {
     SV** svp;
     MAGIC* mg;
@@ -43,35 +52,44 @@ taint_env(void)
        NULL
     };
 
+    if (!PL_envgv)
+       return;
+
 #ifdef VMS
+    {
     int i = 0;
     char name[10 + TYPE_DIGITS(int)] = "DCL$PATH";
 
     while (1) {
        if (i)
            (void)sprintf(name,"DCL$PATH;%d", i);
-       svp = hv_fetch(GvHVn(envgv), name, strlen(name), FALSE);
-       if (!svp || *svp == &sv_undef)
+       svp = hv_fetch(GvHVn(PL_envgv), name, strlen(name), FALSE);
+       if (!svp || *svp == &PL_sv_undef)
            break;
        if (SvTAINTED(*svp)) {
+           dTHR;
            TAINT;
            taint_proper("Insecure %s%s", "$ENV{DCL$PATH}");
        }
        if ((mg = mg_find(*svp, 'e')) && MgTAINTEDDIR(mg)) {
+           dTHR;
            TAINT;
            taint_proper("Insecure directory in %s%s", "$ENV{DCL$PATH}");
        }
        i++;
     }
+  }
 #endif /* VMS */
 
-    svp = hv_fetch(GvHVn(envgv),"PATH",4,FALSE);
+    svp = hv_fetch(GvHVn(PL_envgv),"PATH",4,FALSE);
     if (svp && *svp) {
        if (SvTAINTED(*svp)) {
+           dTHR;
            TAINT;
            taint_proper("Insecure %s%s", "$ENV{PATH}");
        }
        if ((mg = mg_find(*svp, 'e')) && MgTAINTEDDIR(mg)) {
+           dTHR;
            TAINT;
            taint_proper("Insecure directory in %s%s", "$ENV{PATH}");
        }
@@ -79,12 +97,14 @@ taint_env(void)
 
 #ifndef VMS
     /* tainted $TERM is okay if it contains no metachars */
-    svp = hv_fetch(GvHVn(envgv),"TERM",4,FALSE);
+    svp = hv_fetch(GvHVn(PL_envgv),"TERM",4,FALSE);
     if (svp && *svp && SvTAINTED(*svp)) {
-       bool was_tainted = tainted;
-       char *t = SvPV(*svp, na);
-       char *e = t + na;
-       tainted = was_tainted;
+       dTHR;   /* just for taint */
+       STRLEN n_a;
+       bool was_tainted = PL_tainted;
+       char *t = SvPV(*svp, n_a);
+       char *e = t + n_a;
+       PL_tainted = was_tainted;
        if (t < e && isALNUM(*t))
            t++;
        while (t < e && (isALNUM(*t) || *t == '-' || *t == ':'))
@@ -97,8 +117,9 @@ taint_env(void)
 #endif /* !VMS */
 
     for (e = misc_env; *e; e++) {
-       svp = hv_fetch(GvHVn(envgv), *e, strlen(*e), FALSE);
-       if (svp && *svp != &sv_undef && SvTAINTED(*svp)) {
+       svp = hv_fetch(GvHVn(PL_envgv), *e, strlen(*e), FALSE);
+       if (svp && *svp != &PL_sv_undef && SvTAINTED(*svp)) {
+           dTHR;       /* just for taint */
            TAINT;
            taint_proper("Insecure $ENV{%s}%s", *e);
        }