Integrate:
authorNicholas Clark <nick@ccl4.org>
Mon, 1 Dec 2008 22:57:16 +0000 (22:57 +0000)
committerNicholas Clark <nick@ccl4.org>
Mon, 1 Dec 2008 22:57:16 +0000 (22:57 +0000)
[ 34962]
Integrate:
[ 34954]
Proposed fix for -T -d:NYTProf regression. Probably this is a "missing"
part of change 24943.

[ 34955]
This feels like a more robust location than that of change 34954.
p4raw-link: @34962 on //depot/maint-5.10/perl: 3195c97a95bf0510cb062b424557c0a657a64c7d
p4raw-link: @34955 on //depot/perl: c6ae76470e6575530141df6c32cf71111bc2e391
p4raw-link: @34954 on //depot/perl: 13d4578c5c4d6d1ff771e38874408fea77a13d75

p4raw-id: //depot/maint-5.8/perl@34974
p4raw-integrated: from //depot/maint-5.10/perl@34928 'merge in' scope.c
(@34599..)

scope.c

index f8e6fcb..793a7cc 100644 (file)
--- a/scope.c
+++ b/scope.c
@@ -618,6 +618,8 @@ Perl_leave_scope(pTHX_ I32 base)
     if (base < -1)
        Perl_croak(aTHX_ "panic: corrupt saved stack index");
     while (PL_savestack_ix > base) {
+       TAINT_NOT;
+
        const int type = SSPOPINT;
        switch (type) {
        case SAVEt_ITEM:                        /* normal string */