From 3765c7b6d4b25cc705409176e9925fe3e04ee0c6 Mon Sep 17 00:00:00 2001 From: wyhaines Date: Fri, 20 Nov 2009 05:33:12 +0000 Subject: [PATCH] backport r24713 which adds a check for freelist exhaustion in gc_sweep; this prevents segfaults from certain tight loops. An example test case: Time.now while true git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@25871 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ gc.c | 10 +++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index bd6f0ca6e60ec2..62638f9793c840 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Thu Nov 19 2:44:00 2009 Kirk Haines + + * gc.c: backport r24713 which adds a check for freelist exhaustion in gc_sweep; this prevents segfaults from certain tight loops. An example test case: Time.now while true + Fri Aug 28 12:54:00 2009 Kirk Haines * Backport #1524 [ruby-core:23567]; lib/ostrct.rb (OpenStruct@new_ostruct_member): check if it's; also a little code cleanup to do a few things more efficiently. Tests adjusted accordingly. diff --git a/gc.c b/gc.c index 66ce2634cd4fbd..3372b7c279a957 100644 --- a/gc.c +++ b/gc.c @@ -1183,7 +1183,15 @@ gc_sweep() /* clear finalization list */ if (final_list) { deferred_final_list = final_list; - rb_thread_pending = 1; + if (!freelist && !rb_thread_critical) { + rb_gc_finalize_deferred(); + } + else { + rb_thread_pending = 1; + } + if (!freelist) { + add_heap(); + } return; } free_unused_heaps();