X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=taint.c;h=e0869a9bad91686b5bdd4c079c2ec134ad064f54;hb=c0888b2172d1f2ba9efb15c34b86c07026be9abe;hp=4ca7ba7d9c83d3bbfb226ee29e7b2fe2c1033c19;hpb=d085cc716f2bb280bae09a8c1f4d4c39396a0635;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/taint.c b/taint.c
index 4ca7ba7..e0869a9 100644
--- a/taint.c
+++ b/taint.c
@@ -1,6 +1,7 @@
 /*    taint.c
  *
- *    Copyright (c) 1997-2002, Larry Wall
+ *    Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+ *    2000, 2001, 2002, by Larry Wall and others
  *
  *    You may distribute under the terms of either the GNU General Public
  *    License or the Artistic License, as specified in the README file.
@@ -13,6 +14,9 @@
  * liar, Saruman, and a corrupter of men's hearts."  --Theoden
  */
 
+/* This file contains a few functions for handling data tainting in Perl
+ */
+
 #include "EXTERN.h"
 #define PERL_IN_TAINT_C
 #include "perl.h"
@@ -20,24 +24,22 @@
 void
 Perl_taint_proper(pTHX_ const char *f, const char *s)
 {
-    char *ug;
-
 #if defined(HAS_SETEUID) && defined(DEBUGGING)
 #   if Uid_t_size == 1
     {
-	 UV  uid = PL_uid;
-	 UV euid = PL_euid;
+	const UV  uid = PL_uid;
+	const UV euid = PL_euid;
 
-	 DEBUG_u(PerlIO_printf(Perl_debug_log,
+	DEBUG_u(PerlIO_printf(Perl_debug_log,
 			       "%s %d %"UVuf" %"UVuf"\n",
 			       s, PL_tainted, uid, euid));
     }
 #   else
     {
-	 IV  uid = PL_uid;
-	 IV euid = PL_euid;
+	const IV  uid = PL_uid;
+	const IV euid = PL_euid;
 
-	 DEBUG_u(PerlIO_printf(Perl_debug_log,
+	DEBUG_u(PerlIO_printf(Perl_debug_log,
 			       "%s %d %"IVdf" %"IVdf"\n",
 			       s, PL_tainted, uid, euid));
     }
@@ -45,6 +47,8 @@ Perl_taint_proper(pTHX_ const char *f, const char *s)
 #endif
 
     if (PL_tainted) {
+	const char *ug;
+
 	if (!f)
 	    f = PL_no_security;
 	if (PL_euid != PL_uid)
@@ -70,8 +74,8 @@ Perl_taint_env(pTHX)
 {
     SV** svp;
     MAGIC* mg;
-    char** e;
-    static char* misc_env[] = {
+    const char* const *e;
+    static const char* const misc_env[] = {
 	"IFS",		/* most shells' inter-field separators */
 	"CDPATH",	/* ksh dain bramage #1 */
 	"ENV",		/* ksh dain bramage #2 */
@@ -79,8 +83,25 @@ Perl_taint_env(pTHX)
 	NULL
     };
 
+    /* Don't bother if there's no *ENV glob */
     if (!PL_envgv)
 	return;
+    /* If there's no %ENV hash of if it's not magical, croak, because
+     * it probably doesn't reflect the actual environment */
+    if (!GvHV(PL_envgv) || !(SvRMAGICAL(GvHV(PL_envgv))
+	    && mg_find((SV*)GvHV(PL_envgv), PERL_MAGIC_env))) {
+	const bool was_tainted = PL_tainted;
+	const char * const name = GvENAME(PL_envgv);
+	PL_tainted = TRUE;
+	if (strEQ(name,"ENV"))
+	    /* hash alias */
+	    taint_proper("%%ENV is aliased to %s%s", "another variable");
+	else
+	    /* glob alias: report it in the error message */
+	    taint_proper("%%ENV is aliased to %%%s%s", name);
+	/* this statement is reached under -t or -U */
+	PL_tainted = was_tainted;
+    }
 
 #ifdef VMS
     {
@@ -122,10 +143,10 @@ Perl_taint_env(pTHX)
     /* tainted $TERM is okay if it contains no metachars */
     svp = hv_fetch(GvHVn(PL_envgv),"TERM",4,FALSE);
     if (svp && *svp && SvTAINTED(*svp)) {
-	STRLEN n_a;
-	bool was_tainted = PL_tainted;
-	char *t = SvPV(*svp, n_a);
-	char *e = t + n_a;
+	STRLEN len;
+	const bool was_tainted = PL_tainted;
+	const char *t = SvPV_const(*svp, len);
+	const char * const e = t + len;
 	PL_tainted = was_tainted;
 	if (t < e && isALNUM(*t))
 	    t++;
@@ -139,10 +160,20 @@ Perl_taint_env(pTHX)
 #endif /* !VMS */
 
     for (e = misc_env; *e; e++) {
-	svp = hv_fetch(GvHVn(PL_envgv), *e, strlen(*e), FALSE);
+	SV ** const 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);
 	}
     }
 }
+
+/*
+ * Local variables:
+ * c-indentation-style: bsd
+ * c-basic-offset: 4
+ * indent-tabs-mode: t
+ * End:
+ *
+ * ex: set ts=8 sts=4 sw=4 noet:
+ */