summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cygwin/cygwin.c2
-rw-r--r--dist/Cwd/Cwd.pm2
-rw-r--r--dist/Cwd/Cwd.xs8
-rw-r--r--djgpp/djgpp.c4
-rw-r--r--doio.c4
-rw-r--r--os2/os2.c4
-rw-r--r--pp_ctl.c2
-rw-r--r--pp_sys.c10
-rw-r--r--util.c2
-rw-r--r--win32/wince.c2
10 files changed, 1 insertions, 39 deletions
diff --git a/cygwin/cygwin.c b/cygwin/cygwin.c
index e7be5e3232..6b31232d93 100644
--- a/cygwin/cygwin.c
+++ b/cygwin/cygwin.c
@@ -199,9 +199,7 @@ XS(Cygwin_cwd)
if((cwd = getcwd(NULL, -1))) {
ST(0) = sv_2mortal(newSVpv(cwd, 0));
free(cwd);
-#ifndef INCOMPLETE_TAINTS
SvTAINTED_on(ST(0));
-#endif
XSRETURN(1);
}
XSRETURN_UNDEF;
diff --git a/dist/Cwd/Cwd.pm b/dist/Cwd/Cwd.pm
index bd19ea75ba..d9de63cd2d 100644
--- a/dist/Cwd/Cwd.pm
+++ b/dist/Cwd/Cwd.pm
@@ -171,7 +171,7 @@ use strict;
use Exporter;
use vars qw(@ISA @EXPORT @EXPORT_OK $VERSION);
-$VERSION = '3.44';
+$VERSION = '3.45';
my $xs_version = $VERSION;
$VERSION =~ tr/_//;
diff --git a/dist/Cwd/Cwd.xs b/dist/Cwd/Cwd.xs
index dc3da184f6..4ddbdac4bb 100644
--- a/dist/Cwd/Cwd.xs
+++ b/dist/Cwd/Cwd.xs
@@ -251,9 +251,7 @@ int Perl_getcwd_sv(pTHX_ SV *sv)
{
#ifndef PERL_MICRO
-#ifndef INCOMPLETE_TAINTS
SvTAINTED_on(sv);
-#endif
#ifdef HAS_GETCWD
{
@@ -551,9 +549,7 @@ PPCODE:
croak_xs_usage(cv, "");
getcwd_sv(TARG);
XSprePUSH; PUSHTARG;
-#ifndef INCOMPLETE_TAINTS
SvTAINTED_on(TARG);
-#endif
}
void
@@ -580,9 +576,7 @@ PPCODE:
sv_setsv(TARG, &PL_sv_undef);
XSprePUSH; PUSHs(TARG);
-#ifndef INCOMPLETE_TAINTS
SvTAINTED_on(TARG);
-#endif
}
#if defined(WIN32) && !defined(UNDER_CE)
@@ -617,9 +611,7 @@ PPCODE:
Safefree(dir);
XSprePUSH; PUSHs(TARG);
-#ifndef INCOMPLETE_TAINTS
SvTAINTED_on(TARG);
-#endif
}
#endif
diff --git a/djgpp/djgpp.c b/djgpp/djgpp.c
index 9370a2901c..6d136e38bb 100644
--- a/djgpp/djgpp.c
+++ b/djgpp/djgpp.c
@@ -352,9 +352,7 @@ XS(dos_GetCwd)
ST(0)=sv_newmortal ();
if (getcwd (tmp,PATH_MAX+1)!=NULL)
sv_setpv ((SV*)ST(0),tmp);
-#ifndef INCOMPLETE_TAINTS
SvTAINTED_on(ST(0));
-#endif
}
XSRETURN (1);
}
@@ -377,9 +375,7 @@ XS(XS_Cwd_sys_cwd)
RETVAL = getcwd(p, MAXPATHLEN);
ST(0) = sv_newmortal();
sv_setpv((SV*)ST(0), RETVAL);
-#ifndef INCOMPLETE_TAINTS
SvTAINTED_on(ST(0));
-#endif
}
XSRETURN(1);
}
diff --git a/doio.c b/doio.c
index 5223654af0..50ab24f2a1 100644
--- a/doio.c
+++ b/doio.c
@@ -2219,10 +2219,8 @@ Perl_do_msgrcv(pTHX_ SV **mark, SV **sp)
if (ret >= 0) {
SvCUR_set(mstr, sizeof(long)+ret);
*SvEND(mstr) = '\0';
-#ifndef INCOMPLETE_TAINTS
/* who knows who has been playing with this message? */
SvTAINTED_on(mstr);
-#endif
}
return ret;
#else
@@ -2329,10 +2327,8 @@ Perl_do_shmio(pTHX_ I32 optype, SV **mark, SV **sp)
SvCUR_set(mstr, msize);
*SvEND(mstr) = '\0';
SvSETMAGIC(mstr);
-#ifndef INCOMPLETE_TAINTS
/* who knows who has been playing with this shared memory? */
SvTAINTED_on(mstr);
-#endif
}
else {
STRLEN len;
diff --git a/os2/os2.c b/os2/os2.c
index 574c5fc2ce..94b45416c6 100644
--- a/os2/os2.c
+++ b/os2/os2.c
@@ -3461,9 +3461,7 @@ XS(XS_Cwd_sys_cwd)
RETVAL = _getcwd2(p, MAXPATHLEN);
ST(0) = sv_newmortal();
sv_setpv(ST(0), RETVAL);
-#ifndef INCOMPLETE_TAINTS
SvTAINTED_on(ST(0));
-#endif
}
XSRETURN(1);
}
@@ -3595,10 +3593,8 @@ XS(XS_Cwd_sys_abspath)
*t = 0;
SvCUR_set(sv, t - SvPVX(sv));
}
-#ifndef INCOMPLETE_TAINTS
if (!items)
SvTAINTED_on(ST(0));
-#endif
}
XSRETURN(1);
}
diff --git a/pp_ctl.c b/pp_ctl.c
index 63482fd194..f2589768c5 100644
--- a/pp_ctl.c
+++ b/pp_ctl.c
@@ -168,12 +168,10 @@ PP(pp_regcomp)
}
-#ifndef INCOMPLETE_TAINTS
if (TAINTING_get && TAINT_get) {
SvTAINTED_on((SV*)new_re);
RX_TAINT_on(new_re);
}
-#endif
#if !defined(USE_ITHREADS)
/* can't change the optree at runtime either */
diff --git a/pp_sys.c b/pp_sys.c
index 8e09e736db..5656e5a46c 100644
--- a/pp_sys.c
+++ b/pp_sys.c
@@ -3610,9 +3610,7 @@ PP(pp_readlink)
char buf[MAXPATHLEN];
int len;
-#ifndef INCOMPLETE_TAINTS
TAINT;
-#endif
tmps = POPpconstx;
len = readlink(tmps, buf, sizeof(buf) - 1);
if (len < 0)
@@ -3841,10 +3839,8 @@ PP(pp_readdir)
#else
sv = newSVpv(dp->d_name, 0);
#endif
-#ifndef INCOMPLETE_TAINTS
if (!(IoFLAGS(io) & IOf_UNTAINT))
SvTAINTED_on(sv);
-#endif
mXPUSHs(sv);
} while (gimme == G_ARRAY);
@@ -5210,11 +5206,9 @@ PP(pp_gpwent)
sv_setpv(sv, pwent->pw_passwd);
# endif
-# ifndef INCOMPLETE_TAINTS
/* passwd is tainted because user himself can diddle with it.
* admittedly not much and in a very limited way, but nevertheless. */
SvTAINTED_on(sv);
-# endif
sv_setuid(PUSHmortal, pwent->pw_uid);
sv_setgid(PUSHmortal, pwent->pw_gid);
@@ -5257,18 +5251,14 @@ PP(pp_gpwent)
# else
PUSHs(sv = sv_mortalcopy(&PL_sv_no));
# endif
-# ifndef INCOMPLETE_TAINTS
/* pw_gecos is tainted because user himself can diddle with it. */
SvTAINTED_on(sv);
-# endif
mPUSHs(newSVpv(pwent->pw_dir, 0));
PUSHs(sv = sv_2mortal(newSVpv(pwent->pw_shell, 0)));
-# ifndef INCOMPLETE_TAINTS
/* pw_shell is tainted because user himself can diddle with it. */
SvTAINTED_on(sv);
-# endif
# ifdef PWEXPIRE
mPUSHi(pwent->pw_expire);
diff --git a/util.c b/util.c
index ce4c7b6713..f020b4be14 100644
--- a/util.c
+++ b/util.c
@@ -3757,9 +3757,7 @@ Perl_getcwd_sv(pTHX_ SV *sv)
{
#ifndef PERL_MICRO
dVAR;
-#ifndef INCOMPLETE_TAINTS
SvTAINTED_on(sv);
-#endif
PERL_ARGS_ASSERT_GETCWD_SV;
diff --git a/win32/wince.c b/win32/wince.c
index a1e810d82a..15d80f9083 100644
--- a/win32/wince.c
+++ b/win32/wince.c
@@ -2449,9 +2449,7 @@ XS(w32_GetCwd)
EXTEND(SP,1);
SvPOK_on(sv);
ST(0) = sv;
-#ifndef INCOMPLETE_TAINTS
SvTAINTED_on(ST(0));
-#endif
XSRETURN(1);
}