yugui	2011-03-28 22:40:56 +0900 (Mon, 28 Mar 2011)

  New Revision: 31202

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=31202

  Log:
    merges r30743 from trunk into ruby_1_9_2.
    --
    * thread.c (thread_start_func_2): check deadlock condition before
      release thread stack. fix memory violation when deadlock detected.
      reported by Max Aller. [Bug #4009] [ruby-core:32982]

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/thread.c
    branches/ruby_1_9_2/version.h

Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 31201)
+++ ruby_1_9_2/ChangeLog	(revision 31202)
@@ -1,3 +1,9 @@
+Mon Jan 31 21:32:44 2011  CHIKANAGA Tomoyuki  <nagachika00@g...>
+
+	* thread.c (thread_start_func_2): check deadlock condition before
+	  release thread stack. fix memory violation when deadlock detected.
+	  reported by Max Aller. [Bug #4009] [ruby-core:32982]
+
 Mon Jan 31 14:45:47 2011  Yuki Sonoda (Yugui)  <yugui@y...>
 
 	* lib/irb/locale.rb (IRB::Locale::#search_file):
Index: ruby_1_9_2/thread.c
===================================================================
--- ruby_1_9_2/thread.c	(revision 31201)
+++ ruby_1_9_2/thread.c	(revision 31202)
@@ -512,13 +512,14 @@
 	    join_th = join_th->join_list_next;
 	}
 
+	thread_unlock_all_locking_mutexes(th);
+	if (th != main_th) rb_check_deadlock(th->vm);
+
 	if (!th->root_fiber) {
 	    rb_thread_recycle_stack_release(th->stack);
 	    th->stack = 0;
 	}
     }
-    thread_unlock_all_locking_mutexes(th);
-    if (th != main_th) rb_check_deadlock(th->vm);
     if (th->vm->main_thread == th) {
 	ruby_cleanup(state);
     }
Index: ruby_1_9_2/version.h
===================================================================
--- ruby_1_9_2/version.h	(revision 31201)
+++ ruby_1_9_2/version.h	(revision 31202)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_PATCHLEVEL 185
+#define RUBY_PATCHLEVEL 186
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/