diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-06-06 09:37:59 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-06-06 09:37:59 +0000 |
| commit | 65ac4a560232d0a042b60602abe0310c75831c6e (patch) | |
| tree | fbbcf7f86657a28dc66b8a7fc9f653009e575729 | |
| parent | ab5f23f26c844aa89fb380191e8c70062cab60fa (diff) | |
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
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | test/ruby/test_symbol.rb | 9 | ||||
| -rw-r--r-- | vm_insnhelper.c | 4 |
3 files changed, 18 insertions, 1 deletions
@@ -1,3 +1,9 @@ +Mon Jun 6 18:37:57 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * 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 <duerst@it.aoyama.ac.jp> * 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; } |