From 0ada28f906097f5ba370575a86aef1e42a9d7ba0 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 4 Dec 2015 02:22:44 +0000
Subject: [PATCH] thread.c: name must be ascii-compatible

* 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
---
 ChangeLog                | 5 +++++
 test/ruby/test_thread.rb | 1 +
 thread.c                 | 6 ++++++
 3 files changed, 12 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 4a5734b2b7..8bd8180088 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
diff --git a/thread.c b/thread.c
index 1444383aa7..6e2d882768 100644
--- a/thread.c
+++ b/thread.c
@@ -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);