X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=taint.c;h=e5f6f8aaa56b6cd8f990f508229050156991c67b;hb=73077d539ecc1b3cdb02af89ac34a6328eef1a86;hp=cd9e4ec5ca899fc63af43df66ab0527a5ba1c2c6;hpb=c90c0ff485be15aaf3ee20121299cb014ee6b1ff;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/taint.c b/taint.c
index cd9e4ec..e5f6f8a 100644
--- a/taint.c
+++ b/taint.c
@@ -5,34 +5,37 @@
  */
 
 #include "EXTERN.h"
+#define PERL_IN_TAINT_C
 #include "perl.h"
 
 void
-taint_proper(f, s)
-const char *f;
-char *s;
+Perl_taint_proper(pTHX_ const char *f, const char *s)
 {
     char *ug;
 
-    DEBUG_u(PerlIO_printf(PerlIO_stderr(),
-            "%s %d %d %d\n", s, tainted, uid, euid));
+#ifdef HAS_SETEUID
+    DEBUG_u(PerlIO_printf(Perl_debug_log,
+            "%s %d %"Uid_t_f" %"Uid_t_f"\n", s, PL_tainted, (long unsigned int)PL_uid, (long unsigned int)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()
+Perl_taint_env(pTHX)
 {
     SV** svp;
     MAGIC* mg;
@@ -45,35 +48,40 @@ taint_env()
 	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)) {
 	    TAINT;
 	    taint_proper("Insecure %s%s", "$ENV{DCL$PATH}");
 	}
-	if ((mg = mg_find(*svp, 'e')) && MgTAINTEDDIR(mg)) {
+	if ((mg = mg_find(*svp, PERL_MAGIC_envelem)) && MgTAINTEDDIR(mg)) {
 	    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)) {
 	    TAINT;
 	    taint_proper("Insecure %s%s", "$ENV{PATH}");
 	}
-	if ((mg = mg_find(*svp, 'e')) && MgTAINTEDDIR(mg)) {
+	if ((mg = mg_find(*svp, PERL_MAGIC_envelem)) && MgTAINTEDDIR(mg)) {
 	    TAINT;
 	    taint_proper("Insecure directory in %s%s", "$ENV{PATH}");
 	}
@@ -81,12 +89,13 @@ taint_env()
 
 #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;
+	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 == ':'))
@@ -99,8 +108,8 @@ taint_env()
 #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)) {
 	    TAINT;
 	    taint_proper("Insecure $ENV{%s}%s", *e);
 	}