This is a live mirror of the Perl 5 development currently hosted at
https://github.com/perl/perl5
https://perl5.git.perl.org
/
perl5.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
op.c: Abstract common override code
[perl5.git]
/
taint.c
diff --git
a/taint.c
b/taint.c
index
fa1366f
..
e24f4f9
100644
(file)
--- a/
taint.c
+++ b/
taint.c
@@
-31,41
+31,30
@@
Perl_taint_proper(pTHX_ const char *f, const char *const s)
PERL_ARGS_ASSERT_TAINT_PROPER;
PERL_ARGS_ASSERT_TAINT_PROPER;
-# if Uid_t_size == 1
{
{
- const U
V uid = PL_uid
;
- const U
V euid = PL_euid
;
+ const U
id_t uid = PerlProc_getuid()
;
+ const U
id_t euid = PerlProc_geteuid()
;
DEBUG_u(PerlIO_printf(Perl_debug_log,
DEBUG_u(PerlIO_printf(Perl_debug_log,
- "%s %d %"U
Vuf" %"UVu
f"\n",
- s,
PL_tainted
, uid, euid));
+ "%s %d %"U
id_t_f" %"Uid_t_
f"\n",
+ s,
TAINT_get
, uid, euid));
}
}
-# else
- {
- const IV uid = PL_uid;
- const IV euid = PL_euid;
-
- DEBUG_u(PerlIO_printf(Perl_debug_log,
- "%s %d %"IVdf" %"IVdf"\n",
- s, PL_tainted, uid, euid));
- }
-# endif
#endif
#endif
- if (
PL_tainted
) {
+ if (
TAINT_get
) {
const char *ug;
if (!f)
f = PL_no_security;
const char *ug;
if (!f)
f = PL_no_security;
- if (P
L_euid != PL_uid
)
+ if (P
erlProc_getuid() != PerlProc_geteuid()
)
ug = " while running setuid";
ug = " while running setuid";
- else if (P
L_egid != PL_gid
)
+ else if (P
erlProc_getgid() != PerlProc_getegid()
)
ug = " while running setgid";
ug = " while running setgid";
- else if (
PL_taint_warn
)
+ else if (
TAINT_WARN_get
)
ug = " while running with -t switch";
else
ug = " while running with -T switch";
ug = " while running with -t switch";
else
ug = " while running with -T switch";
- if (PL_unsafe ||
PL_taint_warn
) {
+ if (PL_unsafe ||
TAINT_WARN_get
) {
Perl_ck_warner_d(aTHX_ packWARN(WARN_TAINT), f, s, ug);
}
else {
Perl_ck_warner_d(aTHX_ packWARN(WARN_TAINT), f, s, ug);
}
else {
@@
-95,13
+84,13
@@
Perl_taint_env(pTHX)
/* Don't bother if there's no *ENV glob */
if (!PL_envgv)
return;
/* Don't bother if there's no *ENV glob */
if (!PL_envgv)
return;
- /* If there's no %ENV hash o
f
if it's not magical, croak, because
+ /* If there's no %ENV hash o
r
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))) {
* 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 =
PL_tainted
;
+ const bool was_tainted =
TAINT_get
;
const char * const name = GvENAME(PL_envgv);
const char * const name = GvENAME(PL_envgv);
-
PL_tainted = TRUE
;
+
TAINT
;
if (strEQ(name,"ENV"))
/* hash alias */
taint_proper("%%ENV is aliased to %s%s", "another variable");
if (strEQ(name,"ENV"))
/* hash alias */
taint_proper("%%ENV is aliased to %s%s", "another variable");
@@
-109,7
+98,10
@@
Perl_taint_env(pTHX)
/* 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 */
/* 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 */
- PL_tainted = was_tainted;
+ TAINT_set(was_tainted);
+#ifdef NO_TAINT_SUPPORT
+ PERL_UNUSED_VAR(was_tainted);
+#endif
}
#ifdef VMS
}
#ifdef VMS
@@
-154,13
+146,17
@@
Perl_taint_env(pTHX)
svp = hv_fetchs(GvHVn(PL_envgv),"TERM",FALSE);
if (svp && *svp && SvTAINTED(*svp)) {
STRLEN len;
svp = hv_fetchs(GvHVn(PL_envgv),"TERM",FALSE);
if (svp && *svp && SvTAINTED(*svp)) {
STRLEN len;
- const bool was_tainted =
PL_tainted
;
+ const bool was_tainted =
TAINT_get
;
const char *t = SvPV_const(*svp, len);
const char * const e = t + len;
const char *t = SvPV_const(*svp, len);
const char * const e = t + len;
- PL_tainted = was_tainted;
- if (t < e && isALNUM(*t))
+
+ TAINT_set(was_tainted);
+#ifdef NO_TAINT_SUPPORT
+ PERL_UNUSED_VAR(was_tainted);
+#endif
+ if (t < e && isWORDCHAR(*t))
t++;
t++;
- while (t < e && (is
ALNUM
(*t) || strchr("-_.+", *t)))
+ while (t < e && (is
WORDCHAR
(*t) || strchr("-_.+", *t)))
t++;
if (t < e) {
TAINT;
t++;
if (t < e) {
TAINT;
@@
-182,8
+178,8
@@
Perl_taint_env(pTHX)
* Local variables:
* c-indentation-style: bsd
* c-basic-offset: 4
* Local variables:
* c-indentation-style: bsd
* c-basic-offset: 4
- * indent-tabs-mode:
t
+ * indent-tabs-mode:
nil
* End:
*
* End:
*
- * ex: set ts=8 sts=4 sw=4
no
et:
+ * ex: set ts=8 sts=4 sw=4 et:
*/
*/