summaryrefslogtreecommitdiff
path: root/gc.c
diff options
context:
space:
mode:
authornari <nari@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-03-18 09:03:07 +0000
committernari <nari@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-03-18 09:03:07 +0000
commit03c7f0ca43a65b18d81387f82bf91e5d5bc14bee (patch)
tree80e8d681f33c010d2df79b2962326e8799edfda5 /gc.c
parentac454412abff3e4ba084c987802f61dcc4914dae (diff)
* gc.c: Fix unlimited memory growth with large values of
RUBY_FREE_MIN. patched by tmm1(Aman Gupta). [Bug #8095] [ruby-core:53405] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39810 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'gc.c')
-rw-r--r--gc.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/gc.c b/gc.c
index bd95073edc..b568a39bd0 100644
--- a/gc.c
+++ b/gc.c
@@ -1973,8 +1973,9 @@ before_gc_sweep(rb_objspace_t *objspace)
objspace->heap.do_heap_free = (size_t)((heaps_used * HEAP_OBJ_LIMIT) * 0.65);
objspace->heap.free_min = (size_t)((heaps_used * HEAP_OBJ_LIMIT) * 0.2);
if (objspace->heap.free_min < initial_free_min) {
- objspace->heap.do_heap_free = heaps_used * HEAP_OBJ_LIMIT;
objspace->heap.free_min = initial_free_min;
+ if (objspace->heap.do_heap_free < initial_free_min)
+ objspace->heap.do_heap_free = initial_free_min;
}
objspace->heap.sweep_slots = heaps;
objspace->heap.free_num = 0;