/* taint.c
*
- * Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999,
- * 2000, 2001, 2002, by Larry Wall and others
+ * Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+ * 2002, 2003, 2004, 2005, 2006, 2007, 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.
#include "perl.h"
void
-Perl_taint_proper(pTHX_ const char *f, const char *s)
+Perl_taint_proper(pTHX_ const char *f, const char *const s)
{
- const char *ug;
-
#if defined(HAS_SETEUID) && defined(DEBUGGING)
+ dVAR;
+
+ PERL_ARGS_ASSERT_TAINT_PROPER;
+
# 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));
}
#endif
if (PL_tainted) {
+ const char *ug;
+
if (!f)
f = PL_no_security;
if (PL_euid != PL_uid)
else
ug = " while running with -T switch";
if (PL_unsafe || PL_taint_warn) {
- if(ckWARN(WARN_TAINT))
+ if(ckWARN_d(WARN_TAINT))
Perl_warner(aTHX_ packWARN(WARN_TAINT), f, s, ug);
}
else {
void
Perl_taint_env(pTHX)
{
+ dVAR;
SV** svp;
MAGIC* mg;
const char* const *e;
"CDPATH", /* ksh dain bramage #1 */
"ENV", /* ksh dain bramage #2 */
"BASH_ENV", /* bash dain bramage -- I guess it's contagious */
+#ifdef WIN32
+ "PERL5SHELL", /* used for system() on Windows */
+#endif
NULL
};
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);
+ const char * const name = GvENAME(PL_envgv);
PL_tainted = TRUE;
if (strEQ(name,"ENV"))
/* hash alias */
{
int i = 0;
char name[10 + TYPE_DIGITS(int)] = "DCL$PATH";
+ STRLEN len = 8; /* strlen(name) */
while (1) {
if (i)
- (void)sprintf(name,"DCL$PATH;%d", i);
- svp = hv_fetch(GvHVn(PL_envgv), name, strlen(name), FALSE);
+ len = my_sprintf(name,"DCL$PATH;%d", i);
+ svp = hv_fetch(GvHVn(PL_envgv), name, len, FALSE);
if (!svp || *svp == &PL_sv_undef)
break;
if (SvTAINTED(*svp)) {
}
#endif /* VMS */
- svp = hv_fetch(GvHVn(PL_envgv),"PATH",4,FALSE);
+ svp = hv_fetchs(GvHVn(PL_envgv),"PATH",FALSE);
if (svp && *svp) {
if (SvTAINTED(*svp)) {
TAINT;
#ifndef VMS
/* tainted $TERM is okay if it contains no metachars */
- svp = hv_fetch(GvHVn(PL_envgv),"TERM",4,FALSE);
+ svp = hv_fetchs(GvHVn(PL_envgv),"TERM",FALSE);
if (svp && *svp && SvTAINTED(*svp)) {
- STRLEN n_a;
+ STRLEN len;
const bool was_tainted = PL_tainted;
- char *t = SvPV(*svp, n_a);
- char *e = t + n_a;
+ const char *t = SvPV_const(*svp, len);
+ const char * const e = t + len;
PL_tainted = was_tainted;
if (t < e && isALNUM(*t))
t++;
#endif /* !VMS */
for (e = misc_env; *e; e++) {
- svp = hv_fetch(GvHVn(PL_envgv), *e, strlen(*e), FALSE);
+ SV * const * 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:
+ */