X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=taint.c;h=0fe6f3286a2af9d8404e71ea59e5f8699360ee7d;hb=2c15bef39460c09b2a7846a30a4fc1fc1c4f93e4;hp=05a1a44d04818282f8a351318d173741bd6ee9b8;hpb=599cee73f2261c5e09cde7ceba3f9a896989e117;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/taint.c b/taint.c
index 05a1a44..0fe6f32 100644
--- a/taint.c
+++ b/taint.c
@@ -5,10 +5,11 @@
  */
 
 #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;
@@ -17,6 +18,8 @@ taint_proper(const char *f, char *s)
             "%s %d %d %d\n", s, PL_tainted, PL_uid, PL_euid));
 
     if (PL_tainted) {
+	if (!f)
+	    f = PL_no_security;
 	if (PL_euid != PL_uid)
 	    ug = " while running setuid";
 	else if (PL_egid != PL_gid)
@@ -24,14 +27,14 @@ taint_proper(const char *f, char *s)
 	else
 	    ug = " while running with -T switch";
 	if (!PL_unsafe)
-	    croak(f, s, ug);
+	    Perl_croak(aTHX_ f, s, ug);
 	else if (ckWARN(WARN_TAINT))
-	    warner(WARN_TAINT, f, s, ug);
+	    Perl_warner(aTHX_ WARN_TAINT, f, s, ug);
     }
 }
 
 void
-taint_env(void)
+Perl_taint_env(pTHX)
 {
     SV** svp;
     MAGIC* mg;
@@ -44,7 +47,11 @@ taint_env(void)
 	NULL
     };
 
+    if (!PL_envgv)
+	return;
+
 #ifdef VMS
+    {
     int i = 0;
     char name[10 + TYPE_DIGITS(int)] = "DCL$PATH";
 
@@ -66,6 +73,7 @@ taint_env(void)
 	}
 	i++;
     }
+  }
 #endif /* VMS */
 
     svp = hv_fetch(GvHVn(PL_envgv),"PATH",4,FALSE);
@@ -87,9 +95,10 @@ taint_env(void)
     svp = hv_fetch(GvHVn(PL_envgv),"TERM",4,FALSE);
     if (svp && *svp && SvTAINTED(*svp)) {
     	dTHR;	/* just for taint */
+	STRLEN n_a;
 	bool was_tainted = PL_tainted;
-	char *t = SvPV(*svp, PL_na);
-	char *e = t + PL_na;
+	char *t = SvPV(*svp, n_a);
+	char *e = t + n_a;
 	PL_tainted = was_tainted;
 	if (t < e && isALNUM(*t))
 	    t++;