wyhaines	2010-06-09 04:45:41 +0900 (Wed, 09 Jun 2010)

  New Revision: 28235

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

  Log:
    Backport #1785 [ruby-core:24395]; check to make sure finalizer_table isn't null before trying to run finalizers.

  Modified files:
    branches/ruby_1_8_6/ChangeLog
    branches/ruby_1_8_6/gc.c
    branches/ruby_1_8_6/version.h

Index: ruby_1_8_6/ChangeLog
===================================================================
--- ruby_1_8_6/ChangeLog	(revision 28234)
+++ ruby_1_8_6/ChangeLog	(revision 28235)
@@ -1,6 +1,10 @@
+Wed Jun 9 04:35:00 Kirk Haines <khaines@r...>
+
+	* gc.c: Backport #1785 [ruby-core:24395]; check to make sure finalizer_table isn't null before trying to run finalizers.
+
 Wed Jun 9 02:10:00 Kirk Haines <khaines@r...>
 
-	* lib/pathname.rb: Backport #2110 [ruby-core:25627]; backport of r23093 to handle the scenario where, on filesystems like Windows', paths are compared using casecmp instead of ==.
+	* lib/pathname.rb: Backport #2110 [ruby-core:25627]; backport of r23093 to handle the scenario where, on filesystems like Windows', paths are compared using casecmp instead of ==. r28234
 
 Wed Jun 9 01:42:00 Kirk Haines <khaines@r...>
 
Index: ruby_1_8_6/version.h
===================================================================
--- ruby_1_8_6/version.h	(revision 28234)
+++ ruby_1_8_6/version.h	(revision 28235)
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2010-06-09"
 #define RUBY_VERSION_CODE 186
 #define RUBY_RELEASE_CODE 20100609
-#define RUBY_PATCHLEVEL 410
+#define RUBY_PATCHLEVEL 411
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
Index: ruby_1_8_6/gc.c
===================================================================
--- ruby_1_8_6/gc.c	(revision 28234)
+++ ruby_1_8_6/gc.c	(revision 28235)
@@ -1963,7 +1963,7 @@
     int i;
 
     /* run finalizers */
-    if (need_call_final) {
+    if (need_call_final && finalizer_table) {
 	do {
 	    p = deferred_final_list;
 	    deferred_final_list = 0;

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