From 52601dd1cc04becc98777fc8994de18924c18539 Mon Sep 17 00:00:00 2001
From: naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 29 Mar 2016 17:32:36 +0000
Subject: merge revision(s) 53373: [Backport #11922]

	* thread_pthread.c (setup_communication_pipe): delay setting owner
	  (rb_thread_create_timer_thread): until thread creation succeeds
	  [ruby-core:72590] [Bug #11922]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@54426 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 thread_pthread.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'thread_pthread.c')

diff --git a/thread_pthread.c b/thread_pthread.c
index 1acd56c357..a070434afe 100644
--- a/thread_pthread.c
+++ b/thread_pthread.c
@@ -1423,8 +1423,6 @@ setup_communication_pipe(void)
 	return e;
     }
 
-    /* validate pipe on this process */
-    timer_thread_pipe.owner_process = getpid();
     return 0;
 }
 
@@ -1632,6 +1630,9 @@ rb_thread_create_timer_thread(void)
 #endif
 	    return;
 	}
+
+	/* validate pipe on this process */
+	timer_thread_pipe.owner_process = getpid();
 	timer_thread.created = 1;
 #ifdef HAVE_PTHREAD_ATTR_INIT
 	pthread_attr_destroy(&attr);
-- 
cgit v1.2.3