Add PL_ to merged file

[perl5.git] / taint.c

diff --git a/taint.c b/taint.c
index dbb0a1e..88ca8a5 100644 (file)
--- a/taint.c
+++ b/taint.c
@@ -8,50 +8,106 @@
 #include "perl.h"
 
 void
-taint_proper(f, s)
-const char *f;
-char *s;
+taint_proper(const char *f, char *s)
 {
+    dTHR;      /* just for taint */
     char *ug;
 
-    if (tainted) {
-       DEBUG_u(PerlIO_printf(PerlIO_stderr(),
-                             "%s %d %d %d\n", s, tainted, uid, euid));
-       if (euid != uid)
+    DEBUG_u(PerlIO_printf(Perl_debug_log,
+            "%s %d %d %d\n", s, PL_tainted, PL_uid, PL_euid));
+
+    if (PL_tainted) {
+       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)
+       else if (PL_dowarn)
            warn(f, s, ug);
     }
 }
 
 void
-taint_env()
+taint_env(void)
 {
     SV** svp;
-    MAGIC *mg = 0;
-
-    svp = hv_fetch(GvHVn(envgv),"PATH",4,FALSE);
-    if (!svp || *svp == &sv_undef ||
-       ((mg = mg_find(*svp, 't')) && mg->mg_len & 1))
-    {
-       TAINT;
-       if (mg && MgTAINTEDDIR(mg))
-           taint_proper("Insecure directory in %s%s", "$ENV{PATH}");
-       else
+    MAGIC* mg;
+    char** e;
+    static char* misc_env[] = {
+       "IFS",          /* most shells' inter-field separators */
+       "CDPATH",       /* ksh dain bramage #1 */
+       "ENV",          /* ksh dain bramage #2 */
+       "BASH_ENV",     /* bash dain bramage -- I guess it's contagious */
+       NULL
+    };
+
+#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)
+           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(PL_envgv),"PATH",4,FALSE);
+    if (svp && *svp) {
+       if (SvTAINTED(*svp)) {
+           dTHR;
+           TAINT;
            taint_proper("Insecure %s%s", "$ENV{PATH}");
+       }
+       if ((mg = mg_find(*svp, 'e')) && MgTAINTEDDIR(mg)) {
+           dTHR;
+           TAINT;
+           taint_proper("Insecure directory in %s%s", "$ENV{PATH}");
+       }
+    }
+
+#ifndef VMS
+    /* tainted $TERM is okay if it contains no metachars */
+    svp = hv_fetch(GvHVn(PL_envgv),"TERM",4,FALSE);
+    if (svp && *svp && SvTAINTED(*svp)) {
+       dTHR;   /* just for taint */
+       bool was_tainted = PL_tainted;
+       char *t = SvPV(*svp, PL_na);
+       char *e = t + PL_na;
+       PL_tainted = was_tainted;
+       if (t < e && isALNUM(*t))
+           t++;
+       while (t < e && (isALNUM(*t) || *t == '-' || *t == ':'))
+           t++;
+       if (t < e) {
+           TAINT;
+           taint_proper("Insecure $ENV{%s}%s", "TERM");
+       }
     }
+#endif /* !VMS */
 
-    svp = hv_fetch(GvHVn(envgv),"IFS",3,FALSE);
-    if (svp && *svp != &sv_undef &&
-       (mg = mg_find(*svp, 't')) && mg->mg_len & 1)
-    {
-       TAINT;
-       taint_proper("Insecure %s%s", "$ENV{IFS}");
+    for (e = misc_env; *e; e++) {
+       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);
+       }
     }
 }