summaryrefslogtreecommitdiff
path: root/gc.c
diff options
context:
space:
mode:
authorko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-03-29 04:37:06 +0000
committerko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-03-29 04:37:06 +0000
commit835186a322d8a812cdbeb2f00ecd642cffde9fee (patch)
tree82dc80b097ccc652935b9533a4a49451e1d72263 /gc.c
parentec02cc293d7e760f0d66176d14b1b37c608acef2 (diff)
* gc.c (gc_before_sweep): cap `malloc_limit' to
gc_params.malloc_limit_max. It can grow and grow with such case: `loop{"a" * (1024 ** 2)}' [Bug #9687] This issue is pointed by Tim Robertson. http://www.omniref.com/blog/blog/2014/03/27/ruby-garbage-collection-still-not-ready-for-production/ git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@45468 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'gc.c')
-rw-r--r--gc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/gc.c b/gc.c
index 106b2ecde7..3b9721e9d3 100644
--- a/gc.c
+++ b/gc.c
@@ -2890,7 +2890,7 @@ gc_before_sweep(rb_objspace_t *objspace)
malloc_limit = (size_t)(inc * gc_params.malloc_limit_growth_factor);
if (gc_params.malloc_limit_max > 0 && /* ignore max-check if 0 */
malloc_limit > gc_params.malloc_limit_max) {
- malloc_limit = inc;
+ malloc_limit = gc_params.malloc_limit_max;
}
}
else {