* 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
This commit is contained in:
nari 2013-03-18 09:03:07 +00:00
Родитель ac454412ab
Коммит 03c7f0ca43
2 изменённых файлов: 8 добавлений и 1 удалений

Просмотреть файл

@ -1,3 +1,9 @@
Mon Mar 18 17:58:36 2013 Narihiro Nakamura <authornari@gmail.com>
* gc.c: Fix unlimited memory growth with large values of
RUBY_FREE_MIN. patched by tmm1(Aman Gupta).
[Bug #8095] [ruby-core:53405]
Mon Mar 18 14:46:19 2013 NAKAMURA Usaku <usa@ruby-lang.org> Mon Mar 18 14:46:19 2013 NAKAMURA Usaku <usa@ruby-lang.org>
* test/win32ole/test_err_in_callback.rb * test/win32ole/test_err_in_callback.rb

3
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.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); objspace->heap.free_min = (size_t)((heaps_used * HEAP_OBJ_LIMIT) * 0.2);
if (objspace->heap.free_min < initial_free_min) { 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; 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.sweep_slots = heaps;
objspace->heap.free_num = 0; objspace->heap.free_num = 0;