diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-03-14 05:54:35 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-03-14 05:54:35 +0000 |
| commit | 1943242a4688ac0957c279b782d273fdb1f25015 (patch) | |
| tree | 6abb615150a089ed7073dd8cb1a1a1e4c2c0e10c | |
| parent | c3f92cf21338d93dccbca9b22dcdf80e9a275cdc (diff) | |
| download | ruby-1943242a4688ac0957c279b782d273fdb1f25015.tar.gz | |
thread.c: Thread.start with Symbol
* thread.c (thread_do_start): fix segfault at start with Symbol.
proc created by Symbol#to_proc does not have environment unless
using refinements. [ruby-core:80147] [Bug #13313]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@57969 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | test/ruby/test_thread.rb | 8 | ||||
| -rw-r--r-- | thread.c | 3 |
2 files changed, 10 insertions, 1 deletions
diff --git a/test/ruby/test_thread.rb b/test/ruby/test_thread.rb index c82018dc8e..e9bf1f16b6 100644 --- a/test/ruby/test_thread.rb +++ b/test/ruby/test_thread.rb @@ -176,6 +176,14 @@ class TestThread < Test::Unit::TestCase t2.kill if t2 end + def test_new_symbol_proc + bug = '[ruby-core:80147] [Bug #13313]' + assert_ruby_status([], "#{<<-"begin;"}\n#{<<-'end;'}", bug) + begin; + exit("1" == Thread.start(1, &:to_s).value) + end; + end + def test_join t = Thread.new { sleep } assert_nil(t.join(0.05)) @@ -555,10 +555,11 @@ thread_do_start(rb_thread_t *th, VALUE args) { native_set_thread_name(th); if (!th->first_func) { + const VALUE *ep = vm_proc_ep(th->first_proc); rb_proc_t *proc; GetProcPtr(th->first_proc, proc); th->errinfo = Qnil; - th->root_lep = rb_vm_ep_local_ep(vm_proc_ep(th->first_proc)); + th->root_lep = ep ? rb_vm_ep_local_ep(ep) : NULL; th->root_svar = Qfalse; EXEC_EVENT_HOOK(th, RUBY_EVENT_THREAD_BEGIN, th->self, 0, 0, 0, Qundef); th->value = rb_vm_invoke_proc(th, proc, |