From 65ac4a560232d0a042b60602abe0310c75831c6e Mon Sep 17 00:00:00 2001 From: nobu Date: Mon, 6 Jun 2016 09:37:59 +0000 Subject: vm_insnhelper.c: check symbol proc to throw * vm_insnhelper.c (vm_throw_start): check if the iseq is symbol proc, class definition should not be a symbol proc. [ruby-core:75856] [Bug #12462] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55297 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ test/ruby/test_symbol.rb | 9 +++++++++ vm_insnhelper.c | 4 +++- 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index aba73c7d53..9d453fba9c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Mon Jun 6 18:37:57 2016 Nobuyoshi Nakada + + * vm_insnhelper.c (vm_throw_start): check if the iseq is symbol + proc, class definition should not be a symbol proc. + [ruby-core:75856] [Bug #12462] + Mon Jun 6 18:36:34 2016 Martin Duerst * string.c: Added UTF-16BE/LE and UTF-32BE/LE to supported encodings diff --git a/test/ruby/test_symbol.rb b/test/ruby/test_symbol.rb index 8bb9902317..03934226a1 100644 --- a/test/ruby/test_symbol.rb +++ b/test/ruby/test_symbol.rb @@ -157,6 +157,15 @@ class TestSymbol < Test::Unit::TestCase assert_equal(1, first, bug11594) end + private def return_from_proc + Proc.new { return 1 }.tap(&:call) + end + + def test_return_from_symbol_proc + bug12462 = '[ruby-core:75856] [Bug #12462]' + assert_equal(1, return_from_proc, bug12462) + end + def test_to_proc_for_hash_each bug11830 = '[ruby-core:72205] [Bug #11830]' assert_normal_exit(<<-'end;', bug11830) # do diff --git a/vm_insnhelper.c b/vm_insnhelper.c index 691c37a3df..3841801c41 100644 --- a/vm_insnhelper.c +++ b/vm_insnhelper.c @@ -995,7 +995,9 @@ vm_throw_start(rb_thread_t *const th, rb_control_frame_t *const reg_cfp, enum ru target_lep = lep; } - if (lep == target_lep && escape_cfp->iseq->body->type == ISEQ_TYPE_CLASS) { + if (lep == target_lep && + RUBY_VM_NORMAL_ISEQ_P(escape_cfp->iseq) && + escape_cfp->iseq->body->type == ISEQ_TYPE_CLASS) { in_class_frame = 1; target_lep = 0; } -- cgit v1.2.3