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

thread.c: name must be ascii-compatible

Browse source 
* thread.c (rb_thread_setname): name must be ascii-compatible, as
  pthread APIs do not accept legacy wide char strings.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52876 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2015-12-04 02:22:44 +00:00
parent b887c7c20a
commit 0ada28f906
3 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Fri Dec 4 11:22:40 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
* thread.c (rb_thread_setname): name must be ascii-compatible, as
pthread APIs do not accept legacy wide char strings.
Thu Dec 3 16:02:17 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> Thu Dec 3 16:02:17 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
* string.c (rb_obj_as_string): fstring should not be infected. * string.c (rb_obj_as_string): fstring should not be infected.

1
test/ruby/test_thread.rb
View file

@ -1067,6 +1067,7 @@ q.pop
bug11756 = '[ruby-core:71774] [Bug #11756]' bug11756 = '[ruby-core:71774] [Bug #11756]'
t = Thread.start {} t = Thread.start {}
assert_raise(ArgumentError, bug11756) {t.name = "foo\0bar"} assert_raise(ArgumentError, bug11756) {t.name = "foo\0bar"}
assert_raise(ArgumentError, bug11756) {t.name = "foo".encode(Encoding::UTF_32BE)}
ensure ensure
t.kill t.kill
t.join t.join

6
thread.c
View file

@ -2780,7 +2780,13 @@ rb_thread_setname(VALUE thread, VALUE name)
rb_thread_t *th; rb_thread_t *th;
GetThreadPtr(thread, th); GetThreadPtr(thread, th);
if (!NIL_P(name)) { if (!NIL_P(name)) {
rb_encoding *enc;
StringValueCStr(name); StringValueCStr(name);
enc = rb_enc_get(name);
if (!rb_enc_asciicompat(enc)) {
rb_raise(rb_eArgError, "ASCII incompatible encoding (%s)",
rb_enc_name(enc));
}
name = rb_str_new_frozen(name); name = rb_str_new_frozen(name);
#ifdef SET_ANOTHER_THREAD_NAME #ifdef SET_ANOTHER_THREAD_NAME
s = RSTRING_PTR(name); s = RSTRING_PTR(name);