summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-07-17 15:48:05 +0000
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-07-17 15:48:05 +0000
commit68201165edb493fd48426c039bd84a25c326fdca (patch)
tree903dd17ffbd77a331860fe863e28400bec5bd53c
parent4156653bc05e54b2f779a7aa4ba354d957914238 (diff)
* gc.c (rb_gc_call_finalizer_at_exit): finalizer_table can be NULL.
[ruby-core:24395] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@24178 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--gc.c2
-rw-r--r--version.h8
3 files changed, 10 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 22674de35e..a27c01a2be 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Jul 18 00:44:43 2009 URABE Shyouhei <shyouhei@ruby-lang.org>
+
+ * gc.c (rb_gc_call_finalizer_at_exit): finalizer_table can be NULL.
+ [ruby-core:24395]
+
Thu Jul 16 09:35:06 2009 Akinori MUSHA <knu@iDaemons.org>
* lib/delegate.rb (Delegator#method_missing)
diff --git a/gc.c b/gc.c
index da56b9d044..52b1c23e6b 100644
--- a/gc.c
+++ b/gc.c
@@ -1998,7 +1998,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 d41d89be3b..6933b83941 100644
--- a/version.h
+++ b/version.h
@@ -1,15 +1,15 @@
#define RUBY_VERSION "1.8.7"
-#define RUBY_RELEASE_DATE "2009-07-16"
+#define RUBY_RELEASE_DATE "2009-07-18"
#define RUBY_VERSION_CODE 187
-#define RUBY_RELEASE_CODE 20090716
-#define RUBY_PATCHLEVEL 185
+#define RUBY_RELEASE_CODE 20090718
+#define RUBY_PATCHLEVEL 186
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8
#define RUBY_VERSION_TEENY 7
#define RUBY_RELEASE_YEAR 2009
#define RUBY_RELEASE_MONTH 7
-#define RUBY_RELEASE_DAY 16
+#define RUBY_RELEASE_DAY 18
#ifdef RUBY_EXTERN
RUBY_EXTERN const char ruby_version[];