Fix parsing goto statements in multicalled subroutine
This commit is contained in:
Petr Písař
parent
d1db9a0791
commit
affaa4c7f0
|
|
@ -0,0 +1,94 @@
|
|||
From 0a1ddbeaeeea3c690c2408bd4c3a61c05cb9695f Mon Sep 17 00:00:00 2001
|
||||
From: Zefram <zefram@fysh.org>
|
||||
Date: Mon, 23 Jan 2017 02:25:50 +0000
|
||||
Subject: [PATCH] permit goto at top level of multicalled sub
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Petr Písař: Ported to 5.24.1:
|
||||
|
||||
commit 3c157b3cf0631c69ffa5aa2d55b9199bf93b22a9
|
||||
Author: Zefram <zefram@fysh.org>
|
||||
Date: Mon Jan 23 02:25:50 2017 +0000
|
||||
|
||||
permit goto at top level of multicalled sub
|
||||
|
||||
A multicalled sub is reckoned to be a pseudo block, out of which it is
|
||||
not permissible to goto. However, the test for a pseudo block was being
|
||||
applied too early, preventing not just escape from a multicalled sub but
|
||||
also a goto at the top level within the sub. This is a bug similar, but
|
||||
not identical, to [perl #113938]. Now the test is deferred, permitting
|
||||
goto at the sub's top level but still forbidding goto out of it.
|
||||
|
||||
Signed-off-by: Petr Písař <ppisar@redhat.com>
|
||||
---
|
||||
pp_ctl.c | 11 ++++++-----
|
||||
t/op/goto.t | 11 ++++++++++-
|
||||
2 files changed, 16 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/pp_ctl.c b/pp_ctl.c
|
||||
index e859e01..a1fc2f4 100644
|
||||
--- a/pp_ctl.c
|
||||
+++ b/pp_ctl.c
|
||||
@@ -2921,6 +2921,7 @@ PP(pp_goto)
|
||||
OP *gotoprobe = NULL;
|
||||
bool leaving_eval = FALSE;
|
||||
bool in_block = FALSE;
|
||||
+ bool pseudo_block = FALSE;
|
||||
PERL_CONTEXT *last_eval_cx = NULL;
|
||||
|
||||
/* find label */
|
||||
@@ -2959,11 +2960,9 @@ PP(pp_goto)
|
||||
gotoprobe = PL_main_root;
|
||||
break;
|
||||
case CXt_SUB:
|
||||
- if (CvDEPTH(cx->blk_sub.cv) && !CxMULTICALL(cx)) {
|
||||
- gotoprobe = CvROOT(cx->blk_sub.cv);
|
||||
- break;
|
||||
- }
|
||||
- /* FALLTHROUGH */
|
||||
+ gotoprobe = CvROOT(cx->blk_sub.cv);
|
||||
+ pseudo_block = cBOOL(CxMULTICALL(cx));
|
||||
+ break;
|
||||
case CXt_FORMAT:
|
||||
case CXt_NULL:
|
||||
DIE(aTHX_ "Can't \"goto\" out of a pseudo block");
|
||||
@@ -2992,6 +2991,8 @@ PP(pp_goto)
|
||||
break;
|
||||
}
|
||||
}
|
||||
+ if (pseudo_block)
|
||||
+ DIE(aTHX_ "Can't \"goto\" out of a pseudo block");
|
||||
PL_lastgotoprobe = gotoprobe;
|
||||
}
|
||||
if (!retop)
|
||||
diff --git a/t/op/goto.t b/t/op/goto.t
|
||||
index aa2f24f..07bd6fb 100644
|
||||
--- a/t/op/goto.t
|
||||
+++ b/t/op/goto.t
|
||||
@@ -10,7 +10,7 @@ BEGIN {
|
||||
|
||||
use warnings;
|
||||
use strict;
|
||||
-plan tests => 98;
|
||||
+plan tests => 99;
|
||||
our $TODO;
|
||||
|
||||
my $deprecated = 0;
|
||||
@@ -774,3 +774,12 @@ sub FETCH { $_[0][0] }
|
||||
tie my $t, "", sub { "cluck up porridge" };
|
||||
is eval { sub { goto $t }->() }//$@, 'cluck up porridge',
|
||||
'tied arg returning sub ref';
|
||||
+
|
||||
+sub revnumcmp ($$) {
|
||||
+ goto FOO;
|
||||
+ die;
|
||||
+ FOO:
|
||||
+ return $_[1] <=> $_[0];
|
||||
+}
|
||||
+is eval { join(":", sort revnumcmp (9,5,1,3,7)) }, "9:7:5:3:1",
|
||||
+ "can goto at top level of multicalled sub";
|
||||
--
|
||||
2.7.4
|
||||
|
||||
|
|
@ -265,6 +265,10 @@ Patch73: perl-5.24.1-fix-special-case-recreation-of.patch
|
|||
# Fix a memory leak in B::RHE->HASH method, RT#130504, in upstream after 5.25.9
|
||||
Patch74: perl-5.24.1-Fix-memory-leak-in-B-RHE-HASH-method.patch
|
||||
|
||||
# Fix parsing goto statements in multicalled subroutine, RT#113938,
|
||||
# in upstream after 5.25.9
|
||||
Patch75: perl-5.24.1-permit-goto-at-top-level-of-multicalled-sub.patch
|
||||
|
||||
# Link XS modules to libperl.so with EU::CBuilder on Linux, bug #960048
|
||||
Patch200: perl-5.16.3-Link-XS-modules-to-libperl.so-with-EU-CBuilder-on-Li.patch
|
||||
|
||||
|
|
@ -2963,6 +2967,7 @@ Perl extension for Version Objects
|
|||
%patch72 -p1
|
||||
%patch73 -p1
|
||||
%patch74 -p1
|
||||
%patch75 -p1
|
||||
%patch200 -p1
|
||||
%patch201 -p1
|
||||
|
||||
|
|
@ -3025,6 +3030,7 @@ perl -x patchlevel.h \
|
|||
'Fedora Patch72: Fix UTF-8 string handling in & operator (RT#129287)' \
|
||||
'Fedora Patch73: Fix recreation of *:: (RT#129869)' \
|
||||
'Fedora Patch74: Fix a memory leak in B::RHE->HASH method (RT#130504)' \
|
||||
'Fedora Patch75: Fix parsing goto statements in multicalled subroutine (RT#113938)' \
|
||||
'Fedora Patch200: Link XS modules to libperl.so with EU::CBuilder on Linux' \
|
||||
'Fedora Patch201: Link XS modules to libperl.so with EU::MM on Linux' \
|
||||
%{nil}
|
||||
|
|
@ -5305,6 +5311,7 @@ popd
|
|||
- Fix UTF-8 string handling in & operator (RT#129287)
|
||||
- Fix recreation of *:: (RT#129869)
|
||||
- Fix a memory leak in B::RHE->HASH method (RT#130504)
|
||||
- Fix parsing goto statements in multicalled subroutine (RT#113938)
|
||||
|
||||
* Fri Jan 20 2017 Petr Pisar <ppisar@redhat.com> - 4:5.24.1-386
|
||||
- Fix a buffer overflow in split in scalar context (RT#130262)
|
||||
|
|
|
|||
Loading…
Reference in New Issue