summaryrefslogtreecommitdiff
path: root/taint.c
diff options
context:
space:
mode:
authorMichael G. Schwern <schwern@pobox.com>2020-12-28 18:04:52 -0800
committerKarl Williamson <khw@cpan.org>2021-01-17 09:18:15 -0700
commit1604cfb0273418ed479719f39def5ee559bffda2 (patch)
tree166a5ab935a029ab86cf6295d6f3cb77da22e559 /taint.c
parent557ff1b2a4ecd18fe9229e7e0eb8fa123adc5670 (diff)
downloadperl-1604cfb0273418ed479719f39def5ee559bffda2.tar.gz
style: Detabify indentation of the C code maintained by the core.
This just detabifies to get rid of the mixed tab/space indentation. Applying consistent indentation and dealing with other tabs are another issue. Done with `expand -i`. * vutil.* left alone, it's part of version. * Left regen managed files alone for now.
Diffstat (limited to 'taint.c')
-rw-r--r--taint.c150
1 files changed, 75 insertions, 75 deletions
diff --git a/taint.c b/taint.c
index 583454899c..9ff3c308e3 100644
--- a/taint.c
+++ b/taint.c
@@ -33,15 +33,15 @@ Perl_taint_proper(pTHX_ const char *f, const char *const s)
PERL_ARGS_ASSERT_TAINT_PROPER;
{
- const Uid_t uid = PerlProc_getuid();
- const Uid_t euid = PerlProc_geteuid();
+ 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,
+ 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,
+ DEBUG_u(PerlIO_printf(Perl_debug_log,
"%s %d %" IVdf " %" IVdf "\n",
s, TAINT_get, (IV)uid, (IV)euid));
#endif
@@ -49,25 +49,25 @@ Perl_taint_proper(pTHX_ const char *f, const char *const s)
#endif
if (TAINT_get) {
- const char *ug;
-
- if (!f)
- f = PL_no_security;
- if (PerlProc_getuid() != PerlProc_geteuid())
- ug = " while running setuid";
- else if (PerlProc_getgid() != PerlProc_getegid())
- ug = " while running setgid";
- else if (TAINT_WARN_get)
+ const char *ug;
+
+ if (!f)
+ f = PL_no_security;
+ if (PerlProc_getuid() != PerlProc_geteuid())
+ ug = " while running setuid";
+ else if (PerlProc_getgid() != PerlProc_getegid())
+ ug = " while running setgid";
+ else if (TAINT_WARN_get)
ug = " while running with -t switch";
else
- ug = " while running with -T switch";
+ 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);
+ if (PL_unsafe || TAINT_WARN_get) {
+ Perl_ck_warner_d(aTHX_ packWARN(WARN_TAINT), f, s, ug);
}
else {
Perl_croak(aTHX_ f, s, ug);
@@ -83,34 +83,34 @@ Perl_taint_env(pTHX)
SV** svp;
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 */
- "BASH_ENV", /* bash dain bramage -- I guess it's contagious */
+ "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 */
#ifdef WIN32
- "PERL5SHELL", /* used for system() on Windows */
+ "PERL5SHELL", /* used for system() on Windows */
#endif
- NULL
+ NULL
};
/* Don't bother if there's no *ENV glob */
if (!PL_envgv)
- return;
+ return;
/* If there's no %ENV hash or 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((const SV *)GvHV(PL_envgv), PERL_MAGIC_env))) {
- const bool was_tainted = TAINT_get;
- const char * const name = GvENAME(PL_envgv);
- TAINT;
- 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 */
- TAINT_set(was_tainted);
+ && mg_find((const SV *)GvHV(PL_envgv), PERL_MAGIC_env))) {
+ const bool was_tainted = TAINT_get;
+ const char * const name = GvENAME(PL_envgv);
+ TAINT;
+ 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 */
+ TAINT_set(was_tainted);
#ifdef NO_TAINT_SUPPORT
PERL_UNUSED_VAR(was_tainted);
#endif
@@ -124,20 +124,20 @@ Perl_taint_env(pTHX)
while (1) {
MAGIC* mg;
- if (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;
- if (SvTAINTED(*svp)) {
- TAINT;
- taint_proper("Insecure %s%s", "$ENV{DCL$PATH}");
- }
- if ((mg = mg_find(*svp, PERL_MAGIC_envelem)) && MgTAINTEDDIR(mg)) {
- TAINT;
- taint_proper("Insecure directory in %s%s", "$ENV{DCL$PATH}");
- }
- i++;
+ if (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;
+ if (SvTAINTED(*svp)) {
+ TAINT;
+ taint_proper("Insecure %s%s", "$ENV{DCL$PATH}");
+ }
+ if ((mg = mg_find(*svp, PERL_MAGIC_envelem)) && MgTAINTEDDIR(mg)) {
+ TAINT;
+ taint_proper("Insecure directory in %s%s", "$ENV{DCL$PATH}");
+ }
+ i++;
}
}
#endif /* VMS */
@@ -145,46 +145,46 @@ 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}");
- }
- if ((mg = mg_find(*svp, PERL_MAGIC_envelem)) && MgTAINTEDDIR(mg)) {
- TAINT;
- taint_proper("Insecure directory in %s%s", "$ENV{PATH}");
- }
+ if (SvTAINTED(*svp)) {
+ TAINT;
+ taint_proper("Insecure %s%s", "$ENV{PATH}");
+ }
+ if ((mg = mg_find(*svp, PERL_MAGIC_envelem)) && MgTAINTEDDIR(mg)) {
+ TAINT;
+ taint_proper("Insecure directory in %s%s", "$ENV{PATH}");
+ }
}
#ifndef VMS
/* tainted $TERM is okay if it contains no metachars */
svp = hv_fetchs(GvHVn(PL_envgv),"TERM",FALSE);
if (svp && *svp && SvTAINTED(*svp)) {
- STRLEN len;
- const bool was_tainted = TAINT_get;
- const char *t = SvPV_const(*svp, len);
- const char * const e = t + len;
+ STRLEN len;
+ const bool was_tainted = TAINT_get;
+ const char *t = SvPV_const(*svp, len);
+ const char * const e = t + len;
- TAINT_set(was_tainted);
+ TAINT_set(was_tainted);
#ifdef NO_TAINT_SUPPORT
PERL_UNUSED_VAR(was_tainted);
#endif
- if (t < e && isWORDCHAR(*t))
- t++;
- while (t < e && (isWORDCHAR(*t) || memCHRs("-_.+", *t)))
- t++;
- if (t < e) {
- TAINT;
- taint_proper("Insecure $ENV{%s}%s", "TERM");
- }
+ if (t < e && isWORDCHAR(*t))
+ t++;
+ while (t < e && (isWORDCHAR(*t) || memCHRs("-_.+", *t)))
+ t++;
+ if (t < e) {
+ TAINT;
+ taint_proper("Insecure $ENV{%s}%s", "TERM");
+ }
}
#endif /* !VMS */
for (e = misc_env; *e; e++) {
- 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);
- }
+ 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);
+ }
}
}