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
mktables: refactor to eliminate a pass over tables
[perl5.git]
/
taint.c
diff --git
a/taint.c
b/taint.c
index
efe5dc4
..
62c171f
100644
(file)
--- a/
taint.c
+++ b/
taint.c
@@
-1,7
+1,7
@@
/* taint.c
*
/* taint.c
*
- * Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999,
- * 200
0, 2001, 2002,
by Larry Wall and others
+ * Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999,
2000, 2001,
+ * 200
2, 2003, 2004, 2005, 2006, 2007, 2008
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.
*
* You may distribute under the terms of either the GNU General Public
* License or the Artistic License, as specified in the README file.
@@
-9,9
+9,11
@@
*/
/*
*/
/*
- * "...we will have peace, when you and all your works have perished--and
- * the works of your dark master to whom you would deliver us. You are a
- * liar, Saruman, and a corrupter of men's hearts." --Theoden
+ * '...we will have peace, when you and all your works have perished--and
+ * the works of your dark master to whom you would deliver us. You are a
+ * liar, Saruman, and a corrupter of men's hearts.' --Théoden
+ *
+ * [p.580 of _The Lord of the Rings_, III/x: "The Voice of Saruman"]
*/
/* This file contains a few functions for handling data tainting in Perl
*/
/* This file contains a few functions for handling data tainting in Perl
@@
-22,10
+24,13
@@
#include "perl.h"
void
#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)
{
#if defined(HAS_SETEUID) && defined(DEBUGGING)
dVAR;
{
#if defined(HAS_SETEUID) && defined(DEBUGGING)
dVAR;
+
+ PERL_ARGS_ASSERT_TAINT_PROPER;
+
# if Uid_t_size == 1
{
const UV uid = PL_uid;
# if Uid_t_size == 1
{
const UV uid = PL_uid;
@@
-61,8
+66,7
@@
Perl_taint_proper(pTHX_ const char *f, const char *s)
else
ug = " while running with -T switch";
if (PL_unsafe || PL_taint_warn) {
else
ug = " while running with -T switch";
if (PL_unsafe || PL_taint_warn) {
- if(ckWARN(WARN_TAINT))
- Perl_warner(aTHX_ packWARN(WARN_TAINT), f, s, ug);
+ Perl_ck_warner_d(aTHX_ packWARN(WARN_TAINT), f, s, ug);
}
else {
Perl_croak(aTHX_ f, s, ug);
}
else {
Perl_croak(aTHX_ f, s, ug);
@@
-82,6
+86,9
@@
Perl_taint_env(pTHX)
"CDPATH", /* ksh dain bramage #1 */
"ENV", /* ksh dain bramage #2 */
"BASH_ENV", /* bash dain bramage -- I guess it's contagious */
"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
};
NULL
};
@@
-91,7
+98,7
@@
Perl_taint_env(pTHX)
/* If there's no %ENV hash of if it's not magical, croak, because
* it probably doesn't reflect the actual environment */
if (!GvHV(PL_envgv) || !(SvRMAGICAL(GvHV(PL_envgv))
/* If there's no %ENV hash of 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((
SV
*)GvHV(PL_envgv), PERL_MAGIC_env))) {
+ && mg_find((
const SV
*)GvHV(PL_envgv), PERL_MAGIC_env))) {
const bool was_tainted = PL_tainted;
const char * const name = GvENAME(PL_envgv);
PL_tainted = TRUE;
const bool was_tainted = PL_tainted;
const char * const name = GvENAME(PL_envgv);
PL_tainted = TRUE;
@@
-130,7
+137,7
@@
Perl_taint_env(pTHX)
}
#endif /* VMS */
}
#endif /* VMS */
- svp = hv_fetch
(GvHVn(PL_envgv),"PATH",4
,FALSE);
+ svp = hv_fetch
s(GvHVn(PL_envgv),"PATH"
,FALSE);
if (svp && *svp) {
if (SvTAINTED(*svp)) {
TAINT;
if (svp && *svp) {
if (SvTAINTED(*svp)) {
TAINT;
@@
-144,7
+151,7
@@
Perl_taint_env(pTHX)
#ifndef VMS
/* tainted $TERM is okay if it contains no metachars */
#ifndef VMS
/* tainted $TERM is okay if it contains no metachars */
- svp = hv_fetch
(GvHVn(PL_envgv),"TERM",4
,FALSE);
+ svp = hv_fetch
s(GvHVn(PL_envgv),"TERM"
,FALSE);
if (svp && *svp && SvTAINTED(*svp)) {
STRLEN len;
const bool was_tainted = PL_tainted;
if (svp && *svp && SvTAINTED(*svp)) {
STRLEN len;
const bool was_tainted = PL_tainted;