perldelta: Move some bug fixes to proper section

[perl5.git] / taint.c

diff --git a/taint.c b/taint.c
index 63f0dfc..1b78928 100644 (file)
--- a/taint.c
+++ b/taint.c
@@ -27,17 +27,21 @@ void
 Perl_taint_proper(pTHX_ const char *f, const char *const s)
 {
 #if defined(HAS_SETEUID) && defined(DEBUGGING)
-    dVAR;
-
     PERL_ARGS_ASSERT_TAINT_PROPER;
 
     {
        const Uid_t  uid = PerlProc_getuid();
        const Uid_t euid = PerlProc_geteuid();
 
+#if Uid_t_sign == 1 /* uid_t is unsigned. */
+       DEBUG_u(PerlIO_printf(Perl_debug_log,
+                              "%s %d %" UVuf " %" UVuf "\n",
+                              s, TAINT_get, (UV)uid, (UV)euid));
+#else /* uid_t is signed (Uid_t_sign == -1), or don't know. */
        DEBUG_u(PerlIO_printf(Perl_debug_log,
-                              "%s %d %"Uid_t_f" %"Uid_t_f"\n",
-                              s, TAINT_get, uid, euid));
+                              "%s %d %" IVdf " %" IVdf "\n",
+                              s, TAINT_get, (IV)uid, (IV)euid));
+#endif
     }
 #endif
 
@@ -55,7 +59,10 @@ Perl_taint_proper(pTHX_ const char *f, const char *const s)
         else
            ug = " while running with -T switch";
 
-        GCC_DIAG_IGNORE(-Wformat-nonliteral); /* fmt checked by caller */
+        /* XXX because taint_proper adds extra format args, we can't
+         * get the caller to check properly; o we just silence the warning
+         * and hope the callers aren't naughty */
+        GCC_DIAG_IGNORE(-Wformat-nonliteral);
        if (PL_unsafe || TAINT_WARN_get) {
            Perl_ck_warner_d(aTHX_ packWARN(WARN_TAINT), f, s, ug);
         }
@@ -70,9 +77,7 @@ Perl_taint_proper(pTHX_ const char *f, const char *const s)
 void
 Perl_taint_env(pTHX)
 {
-    dVAR;
     SV** svp;
-    MAGIC* mg;
     const char* const *e;
     static const char* const misc_env[] = {
        "IFS",          /* most shells' inter-field separators */
@@ -115,6 +120,7 @@ Perl_taint_env(pTHX)
     STRLEN len = 8; /* strlen(name)  */
 
     while (1) {
+        MAGIC* mg;
        if (i)
            len = my_sprintf(name,"DCL$PATH;%d", i);
        svp = hv_fetch(GvHVn(PL_envgv), name, len, FALSE);
@@ -135,6 +141,7 @@ Perl_taint_env(pTHX)
 
     svp = hv_fetchs(GvHVn(PL_envgv),"PATH",FALSE);
     if (svp && *svp) {
+        MAGIC* mg;
        if (SvTAINTED(*svp)) {
            TAINT;
            taint_proper("Insecure %s%s", "$ENV{PATH}");
@@ -179,11 +186,5 @@ Perl_taint_env(pTHX)
 }
 
 /*
- * Local variables:
- * c-indentation-style: bsd
- * c-basic-offset: 4
- * indent-tabs-mode: nil
- * End:
- *
  * ex: set ts=8 sts=4 sw=4 et:
  */