diff options
| author | Robin Houston <robin@cpan.org> | 2001-03-14 02:45:51 +0000 |
|---|---|---|
| committer | Jarkko Hietaniemi <jhi@iki.fi> | 2001-03-14 02:55:00 +0000 |
| commit | 3b2447bced8c335535d7a233343e70749bff7b24 (patch) | |
| tree | 13fe078446c98fdd788438b6f7e8754921b0ae9f /pp_ctl.c | |
| parent | 9c5794fe8bd5803990d11472f5ebcdba0e7877cc (diff) | |
| download | perl-3b2447bced8c335535d7a233343e70749bff7b24.tar.gz | |
PATCH for [ID 20010305.003]
Message-ID: <20010314024551.A16207@puffinry.freeserve.co.uk>
p4raw-id: //depot/perl@9141
Diffstat (limited to 'pp_ctl.c')
| -rw-r--r-- | pp_ctl.c | 13 |
1 files changed, 13 insertions, 0 deletions
@@ -2454,6 +2454,7 @@ PP(pp_goto) if (label && *label) { OP *gotoprobe = 0; + bool leaving_eval = FALSE; /* find label */ @@ -2463,6 +2464,7 @@ PP(pp_goto) cx = &cxstack[ix]; switch (CxTYPE(cx)) { case CXt_EVAL: + leaving_eval = TRUE; if (CxREALEVAL(cx)) { gotoprobe = PL_eval_root; /* XXX not good for nested eval */ break; @@ -2505,6 +2507,17 @@ PP(pp_goto) if (!retop) DIE(aTHX_ "Can't find label %s", label); + /* if we're leaving an eval, check before we pop any frames + that we're not going to punt, otherwise the error + won't be caught */ + + if (leaving_eval && *enterops && enterops[1]) { + I32 i; + for (i = 1; enterops[i]; i++) + if (enterops[i]->op_type == OP_ENTERITER) + DIE(aTHX_ "Can't \"goto\" into the middle of a foreach loop"); + } + /* pop unwanted frames */ if (ix < cxstack_ix) { |