X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=taint.c;h=e163eb4135514914fb100482a78f51e17b8ec6b6;hb=ef54e1a45e68bbd668c909c97e266f20578d5516;hp=2dc43a4ab4f2bab0c0dcabf11baccfb0e16fc621;hpb=af702f0e61214b54e323d12ffeaff4e64bee707c;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/taint.c b/taint.c
index 2dc43a4..e163eb4 100644
--- a/taint.c
+++ b/taint.c
@@ -14,19 +14,21 @@ taint_proper(const char *f, char *s)
     char *ug;
 
     DEBUG_u(PerlIO_printf(Perl_debug_log,
-            "%s %d %d %d\n", s, tainted, uid, euid));
+            "%s %d %d %d\n", s, PL_tainted, PL_uid, PL_euid));
 
-    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)
+	if (!PL_unsafe)
 	    croak(f, s, ug);
-	else if (dowarn)
-	    warn(f, s, ug);
+	else if (ckWARN(WARN_TAINT))
+	    warner(WARN_TAINT, f, s, ug);
     }
 }
 
@@ -44,29 +46,36 @@ 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;
@@ -82,13 +91,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)) {
     	dTHR;	/* just for taint */
-	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 == ':'))
@@ -101,8 +111,8 @@ 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);