From f7d0059e3643ad1713b8abe4969147e2bc185d75 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 15 Apr 2016 12:12:25 +0000
Subject: thread.c: must be initialized to set name

* thread.c (get_initialized_threadptr): extract ensuring that the
  thread is initialized.
* thread.c (rb_thread_setname): thread must be initialized to set
  the name.  [ruby-core:74963] [Bug #12290]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54598 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog                |  8 ++++++++
 test/ruby/test_thread.rb |  6 ++++++
 thread.c                 | 24 +++++++++++++++---------
 3 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e6fc73fb26..6045ee09a5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Fri Apr 15 21:12:23 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* thread.c (get_initialized_threadptr): extract ensuring that the
+	  thread is initialized.
+
+	* thread.c (rb_thread_setname): thread must be initialized to set
+	  the name.  [ruby-core:74963] [Bug #12290]
+
 Fri Apr 15 20:27:16 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
 
 	* lib/irb/ext/save-history.rb: Fix NoMethodError when method is not defined.
diff --git a/test/ruby/test_thread.rb b/test/ruby/test_thread.rb
index ca162f152f..05bb536111 100644
--- a/test/ruby/test_thread.rb
+++ b/test/ruby/test_thread.rb
@@ -1098,4 +1098,10 @@ q.pop
     t.kill
     t.join
   end
+
+  def test_thread_setname_uninitialized
+    bug12290 = '[ruby-core:74963] [Bug #12290]'
+    c = Class.new(Thread) {def initialize() self.name = "foo" end}
+    assert_raise(ThreadError, bug12290) {c.new {}}
+  end
 end
diff --git a/thread.c b/thread.c
index e3efcd3946..e8c7e606d8 100644
--- a/thread.c
+++ b/thread.c
@@ -711,6 +711,18 @@ thread_create_core(VALUE thval, VALUE args, VALUE (*fn)(ANYARGS))
     return thval;
 }
 
+static rb_thread_t *
+get_initialized_threadptr(VALUE thread, VALUE klass)
+{
+    rb_thread_t *th;
+    GetThreadPtr(thread, th);
+    if (!th->first_args) {
+	rb_raise(rb_eThreadError, "uninitialized thread - check `%"PRIsVALUE"#initialize'",
+		 klass);
+    }
+    return th;
+}
+
 /*
  * call-seq:
  *  Thread.new { ... }			-> thread
@@ -734,18 +746,13 @@ thread_create_core(VALUE thval, VALUE args, VALUE (*fn)(ANYARGS))
 static VALUE
 thread_s_new(int argc, VALUE *argv, VALUE klass)
 {
-    rb_thread_t *th;
     VALUE thread = rb_thread_alloc(klass);
 
     if (GET_VM()->main_thread->status == THREAD_KILLED)
 	rb_raise(rb_eThreadError, "can't alloc thread");
 
     rb_obj_call_init(thread, argc, argv);
-    GetThreadPtr(thread, th);
-    if (!th->first_args) {
-	rb_raise(rb_eThreadError, "uninitialized thread - check `%"PRIsVALUE"#initialize'",
-		 klass);
-    }
+    get_initialized_threadptr(thread, klass);
     return thread;
 }
 
@@ -2790,8 +2797,7 @@ rb_thread_setname(VALUE thread, VALUE name)
 #ifdef SET_ANOTHER_THREAD_NAME
     const char *s = "";
 #endif
-    rb_thread_t *th;
-    GetThreadPtr(thread, th);
+    rb_thread_t *th = get_initialized_threadptr(thread, RBASIC_CLASS(thread));
     if (!NIL_P(name)) {
 	rb_encoding *enc;
 	StringValueCStr(name);
@@ -2830,7 +2836,7 @@ rb_thread_inspect(VALUE thread)
     GetThreadPtr(thread, th);
     status = thread_status_name(th);
     str = rb_sprintf("#<%"PRIsVALUE":%p", cname, (void *)thread);
-    if (!NIL_P(th->name)) {
+    if (RTEST(th->name)) {
 	rb_str_catf(str, "@%"PRIsVALUE, th->name);
     }
     if (!th->first_func && th->first_proc) {
-- 
cgit v1.2.3