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

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@28235 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 7 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 4483cdef57..bb7047d541 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
+Wed Jun 9 04:35:00 Kirk Haines <khaines@ruby-lang.org>
+
+	* 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@ruby-lang.org>
 
-	* 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@ruby-lang.org>
 
diff --git a/gc.c b/gc.c
index 3372b7c279..155d05a85b 100644
--- a/gc.c
+++ b/gc.c
@@ -1963,7 +1963,7 @@ rb_gc_call_finalizer_at_exit()
     int i;
 
     /* run finalizers */
-    if (need_call_final) {
+    if (need_call_final && finalizer_table) {
 	do {
 	    p = deferred_final_list;
 	    deferred_final_list = 0;
diff --git a/version.h b/version.h
index c804f109a1..f399aa9115 100644
--- a/version.h
+++ b/version.h
@@ -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