void
Perl_taint_proper(pTHX_ const char *f, const char *const s)
{
-#if defined(HAS_SETEUID) && defined(DEBUGGING)
- dVAR;
+ /* Output a tainting violation, croaking unless we're just to warn.
+ * '_proper' is just to throw you off the scent */
+#if defined(HAS_SETEUID) && defined(DEBUGGING)
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 %"Uid_t_f" %"Uid_t_f"\n",
- s, TAINT_get, uid, euid));
+ "%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 %" IVdf " %" IVdf "\n",
+ s, TAINT_get, (IV)uid, (IV)euid));
+#endif
}
#endif
ug = " while running with -t switch";
else
ug = " while running with -T switch";
+
+ /* XXX because taint_proper adds extra format args, we can't
+ * get the caller to check properly; so we just silence the warning
+ * and hope the callers aren't naughty */
+ GCC_DIAG_IGNORE_STMT(-Wformat-nonliteral);
if (PL_unsafe || TAINT_WARN_get) {
Perl_ck_warner_d(aTHX_ packWARN(WARN_TAINT), f, s, ug);
}
else {
Perl_croak(aTHX_ f, s, ug);
}
+ GCC_DIAG_RESTORE_STMT;
+
}
}
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 */
STRLEN len = 8; /* strlen(name) */
while (1) {
+ MAGIC* mg;
if (i)
- len = my_sprintf(name,"DCL$PATH;%d", i);
+ len = my_snprintf(name, sizeof name, "DCL$PATH;%d", i);
svp = hv_fetch(GvHVn(PL_envgv), name, len, FALSE);
if (!svp || *svp == &PL_sv_undef)
break;
svp = hv_fetchs(GvHVn(PL_envgv),"PATH",FALSE);
if (svp && *svp) {
+ MAGIC* mg;
if (SvTAINTED(*svp)) {
TAINT;
taint_proper("Insecure %s%s", "$ENV{PATH}");
#endif
if (t < e && isWORDCHAR(*t))
t++;
- while (t < e && (isWORDCHAR(*t) || strchr("-_.+", *t)))
+ while (t < e && (isWORDCHAR(*t) || memCHRs("-_.+", *t)))
t++;
if (t < e) {
TAINT;
}
/*
- * Local variables:
- * c-indentation-style: bsd
- * c-basic-offset: 4
- * indent-tabs-mode: nil
- * End:
- *
* ex: set ts=8 sts=4 sw=4 et:
*/