yugui	2008-11-22 23:52:14 +0900 (Sat, 22 Nov 2008)

  New Revision: 20322

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

  Log:
    merges r20291 from trunk into ruby_1_9_1.
    * vm.c (thread_free): th->vm may be NULL when pthread_create
      failed for ENOMEM.  [ruby-dev:37095]

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/vm.c

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 20321)
+++ ruby_1_9_1/ChangeLog	(revision 20322)
@@ -1,3 +1,8 @@
+Fri Nov 21 16:06:54 2008  Yukihiro Matsumoto  <matz@r...>
+
+	* vm.c (thread_free): th->vm may be NULL when pthread_create
+	  failed for ENOMEM.  [ruby-dev:37095]
+
 Thu Nov 20 07:33:15 2008  Yukihiro Matsumoto  <matz@r...>
 
 	* lib/logger.rb (Logger): should handle the case that cvs/svn do
Index: ruby_1_9_1/vm.c
===================================================================
--- ruby_1_9_1/vm.c	(revision 20321)
+++ ruby_1_9_1/vm.c	(revision 20322)
@@ -1486,7 +1486,7 @@
 	}
 #endif
 
-	if (th->vm->main_thread == th) {
+	if (th->vm && th->vm->main_thread == th) {
 	    RUBY_GC_INFO("main thread\n");
 	}
 	else {

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