kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

merge revision(s) 49055: [Backport #10667]

Browse source 
* thread.c (rb_thread_variable_get): fix dynamic symbol keys.
	  rb_check_id() returns non-zero only for static symbols, whereas
	  thread local variable keys can be dynamic symbols.
	  [ruby-core:67185] [Bug #10667]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@49125 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2015-01-03 12:20:06 +00:00
parent 017eb0f12c
commit eb07614085
5 changed files with 28 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
Sat Jan 3 21:17:58 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
* thread.c (rb_thread_variable_get): fix dynamic symbol keys.
rb_check_id() returns non-zero only for static symbols, whereas
thread local variable keys can be dynamic symbols.
[ruby-core:67185] [Bug #10667]
Thu Jan 1 08:29:55 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> Thu Jan 1 08:29:55 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
* cygwin/GNUmakefile.in (EXTOBJS): override to add resource files * cygwin/GNUmakefile.in (EXTOBJS): override to add resource files

8
test/-ext-/symbol/test_inadvertent_creation.rb
View file

@ -202,7 +202,13 @@ module Test_Symbol
Thread.current.thread_variable_set(:test, nil) Thread.current.thread_variable_set(:test, nil)
name = noninterned_name name = noninterned_name
assert_nil(Thread.current.thread_variable_get(name)) assert_nil(Thread.current.thread_variable_get(name))
assert_not_interned(name) assert_not_pinneddown(name)
end
def test_thread_variable_set
name = noninterned_name
Thread.current.thread_variable_set(name, 42)
assert_not_pinneddown(name)
end end
def test_thread_variable? def test_thread_variable?

10
test/ruby/test_thread.rb
View file

@ -432,6 +432,16 @@ class TestThread < Test::Unit::TestCase
end end
end end
def test_thread_local_dynamic_symbol
bug10667 = '[ruby-core:67185] [Bug #10667]'
t = Thread.new {}.join
key_str = "foo#{rand}"
key_sym = key_str.to_sym
t.thread_variable_set(key_str, "bar")
assert_equal("bar", t.thread_variable_get(key_str), "#{bug10667}: string key")
assert_equal("bar", t.thread_variable_get(key_sym), "#{bug10667}: symbol key")
end
def test_select_wait def test_select_wait
assert_nil(IO.select(nil, nil, nil, 0.001)) assert_nil(IO.select(nil, nil, nil, 0.001))
t = Thread.new do t = Thread.new do

4
thread.c
View file

@ -2936,11 +2936,9 @@ static VALUE
rb_thread_variable_get(VALUE thread, VALUE key) rb_thread_variable_get(VALUE thread, VALUE key)
{ {
VALUE locals; VALUE locals;
ID id = rb_check_id(&key);
if (!id) return Qnil;
locals = rb_ivar_get(thread, id_locals); locals = rb_ivar_get(thread, id_locals);
return rb_hash_aref(locals, ID2SYM(id)); return rb_hash_aref(locals, rb_to_symbol(key));
} }
/* /*

6
version.h
View file

@ -1,10 +1,10 @@
#define RUBY_VERSION "2.2.0" #define RUBY_VERSION "2.2.0"
#define RUBY_RELEASE_DATE "2015-01-01" #define RUBY_RELEASE_DATE "2015-01-03"
#define RUBY_PATCHLEVEL 5 #define RUBY_PATCHLEVEL 6
#define RUBY_RELEASE_YEAR 2015 #define RUBY_RELEASE_YEAR 2015
#define RUBY_RELEASE_MONTH 1 #define RUBY_RELEASE_MONTH 1
#define RUBY_RELEASE_DAY 1 #define RUBY_RELEASE_DAY 3
#include "ruby/version.h" #include "ruby/version.h"