The tokenizer should expect an operator after qw().

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

diff --git a/taint.c b/taint.c
index 7914e64..209efb3 100644 (file)
--- 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,7 +24,7 @@
 void
 Perl_taint_proper(pTHX_ const char *f, const char *s)
 {
-    char *ug;
+    const char *ug;
 
 #if defined(HAS_SETEUID) && defined(DEBUGGING)
 #   if Uid_t_size == 1
@@ -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 *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
     {
@@ -123,13 +144,13 @@ Perl_taint_env(pTHX)
     svp = hv_fetch(GvHVn(PL_envgv),"TERM",4,FALSE);
     if (svp && *svp && SvTAINTED(*svp)) {
        STRLEN n_a;
-       bool was_tainted = PL_tainted;
+       const 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 == ':'))
+       while (t < e && (isALNUM(*t) || strchr("-_.+", *t)))
            t++;
        if (t < e) {
            TAINT;
@@ -146,3 +167,13 @@ Perl_taint_env(pTHX)
        }
     }
 }
+
+/*
+ * Local variables:
+ * c-indentation-style: bsd
+ * c-basic-offset: 4
+ * indent-tabs-mode: t
+ * End:
+ *
+ * ex: set ts=8 sts=4 sw=4 noet:
+ */