summaryrefslogtreecommitdiff
path: root/sv.c
diff options
context:
space:
mode:
authorPerl 5 Porters <perl5-porters@africa.nicoh.com>1997-05-08 00:00:00 +1200
committerChip Salzenberg <chip@atlantic.net>1997-05-08 00:00:00 +1200
commit7bac28a0157dcaf170649e8928f053f76dda4253 (patch)
tree88eadd917e84141a07d7cf3db90686edb67fe5a6 /sv.c
parenteb447b8692d1c89cd24ab421497dcff667570be4 (diff)
downloadperl-7bac28a0157dcaf170649e8928f053f76dda4253.tar.gz
[inseparable changes from match from perl-5.003_99 to perl-5.003_99a]
BUILD PROCESS Subject: AFS patches From: Chip Salzenberg <chip@perl.com> Files: Configure installperl CORE LANGUAGE CHANGES Subject: SECURITY: Forbid glob() when tainting (-T or setuid) From: Chip Salzenberg <chip@perl.com> Files: pod/perlrun.pod pod/perlsec.pod pp_sys.c Subject: SECURITY: Forbid exec() if $ENV{TERM} or $ENV{ENV} is tainted From: Chip Salzenberg <chip@perl.com> Files: pod/perlrun.pod pod/perlsec.pod t/op/taint.t taint.c CORE PORTABILITY Subject: (NeXT|Open)Step update Date: Wed, 7 May 97 17:47:02 -0500 From: Gerd Knops <gerti@BITart.com> Files: Configure MANIFEST config_h.SH hints/next_3.sh hints/next_4.sh private-msgid: 9705072247.AA18882@BITart.com Subject: Win32 update (consolidated patch plus three followups) From: Gurusamy Sarathy <gsar@engin.umich.edu> Files: EXTERN.h README.win32 lib/Sys/Hostname.pm pod/perldelta.pod win32/config.H win32/config.w32 win32/config_sh.PL win32/perllib.c win32/win32.c win32/win32.h win32/include/sys/socket.h DOCUMENTATION Subject: Updates to perldelta From: Chip Salzenberg <chip@perl.com> Files: pod/perldelta.pod Subject: Document 'Possible attempt to separate words with commas' Date: 06 May 1997 23:27:55 +0200 From: Gisle Aas <gisle@aas.no> Files: pod/perlop.pod Msg-ID: hyb9snvdw.fsf@bergen.sn.no (applied based on p5p patch as commit 18270fd3b8aafde2f9ea21ea13adde95ef24b149) Subject: Document that C<m?x?> is just like C<?x?> From: Chip Salzenberg <chip@perl.com> Files: pod/perlop.pod OTHER CORE CHANGES Subject: Fix for redefined sort subs nastiness Date: Thu, 08 May 1997 20:04:18 -0400 From: Gurusamy Sarathy <gsar@engin.umich.edu> Files: op.c pod/perldelta.pod pod/perldiag.pod sv.c t/op/sort.t Msg-ID: 199705090004.UAA15032@aatma.engin.umich.edu (applied based on p5p patch as commit e9e069932a0db06904b29e2b09a435afd40ed35c)
Diffstat (limited to 'sv.c')
-rw-r--r--sv.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/sv.c b/sv.c
index d4bc47e370..23b5c58e48 100644
--- a/sv.c
+++ b/sv.c
@@ -1928,6 +1928,11 @@ register SV *sstr;
GvNAMELEN(dstr) = len;
SvFAKE_on(dstr); /* can coerce to non-glob */
}
+ /* ahem, death to those who redefine active sort subs */
+ else if (curstack == sortstack
+ && GvCV(dstr) && sortcop == CvSTART(GvCV(dstr)))
+ croak("Can't redefine active sort subroutine %s",
+ GvNAME(dstr));
(void)SvOK_off(dstr);
GvINTRO_off(dstr); /* one-shot flag */
gp_free((GV*)dstr);
@@ -2010,6 +2015,13 @@ register SV *sstr;
if (!GvCVGEN((GV*)dstr) &&
(CvROOT(cv) || CvXSUB(cv)))
{
+ /* ahem, death to those who redefine
+ * active sort subs */
+ if (curstack == sortstack &&
+ sortcop == CvSTART(cv))
+ croak(
+ "Can't redefine active sort subroutine %s",
+ GvENAME((GV*)dstr));
if (cv_const_sv(cv))
warn("Constant subroutine %s redefined",
GvENAME((GV*)dstr));