diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | test/ruby/test_thread.rb | 1 | ||||
| -rw-r--r-- | thread.c | 6 |
3 files changed, 12 insertions, 0 deletions
@@ -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> * string.c (rb_obj_as_string): fstring should not be infected. diff --git a/test/ruby/test_thread.rb b/test/ruby/test_thread.rb index 0affca294a..516014ac25 100644 --- a/test/ruby/test_thread.rb +++ b/test/ruby/test_thread.rb @@ -1067,6 +1067,7 @@ q.pop bug11756 = '[ruby-core:71774] [Bug #11756]' t = Thread.start {} assert_raise(ArgumentError, bug11756) {t.name = "foo\0bar"} + assert_raise(ArgumentError, bug11756) {t.name = "foo".encode(Encoding::UTF_32BE)} ensure t.kill t.join @@ -2780,7 +2780,13 @@ rb_thread_setname(VALUE thread, VALUE name) rb_thread_t *th; GetThreadPtr(thread, th); if (!NIL_P(name)) { + rb_encoding *enc; 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); #ifdef SET_ANOTHER_THREAD_NAME s = RSTRING_PTR(name); |