1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix integer underflow when using HEAP_INIT_SLOTS

Browse Source 
There is an integer underflow when the environment variable
RUBY_GC_HEAP_INIT_SLOTS is less than the number of slots currently
in the Ruby heap.

[Bug #19284]
This commit is contained in:
Peter Zhu 2022-12-29 20:27:09 -05:00
parent 36c4dda738
commit 90a80eb076
Notes: git 2022-12-30 14:02:09 +00:00 
Merged: https://github.com/ruby/ruby/pull/7044
2 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
gc.c
View File

@ -11719,24 +11719,25 @@ get_envparam_double(const char *name, double *default_value, double lower_bound,
}
static void
gc_set_initial_pages(void)
gc_set_initial_pages(rb_objspace_t *objspace)
{
size_t min_pages;
rb_objspace_t *objspace = &rb_objspace;
gc_rest(objspace);
min_pages = gc_params.heap_init_slots / HEAP_PAGE_OBJ_LIMIT;
size_t pages_per_class = (min_pages - heap_eden_total_pages(objspace)) / SIZE_POOL_COUNT;
for (int i = 0; i < SIZE_POOL_COUNT; i++) {
rb_size_pool_t *size_pool = &size_pools[i];
heap_add_pages(objspace, size_pool, SIZE_POOL_EDEN_HEAP(size_pool), pages_per_class);
if (gc_params.heap_init_slots > size_pool->eden_heap.total_slots) {
size_t slots = gc_params.heap_init_slots - size_pool->eden_heap.total_slots;
int multiple = size_pool->slot_size / BASE_SLOT_SIZE;
size_pool->allocatable_pages = slots * multiple / HEAP_PAGE_OBJ_LIMIT;
}
else {
/* We already have more slots than heap_init_slots allows, so
* prevent creating more pages. */
size_pool->allocatable_pages = 0;
}
}
heap_add_pages(objspace, &size_pools[0], SIZE_POOL_EDEN_HEAP(&size_pools[0]), min_pages - heap_eden_total_pages(objspace));
heap_pages_expand_sorted(objspace);
}
/*
@ -11792,7 +11793,7 @@ ruby_gc_set_params(void)
/* RUBY_GC_HEAP_INIT_SLOTS */
if (get_envparam_size("RUBY_GC_HEAP_INIT_SLOTS", &gc_params.heap_init_slots, 0)) {
gc_set_initial_pages();
gc_set_initial_pages(objspace);
}
get_envparam_double("RUBY_GC_HEAP_GROWTH_FACTOR", &gc_params.growth_factor, 1.0, 0.0, FALSE);

5
test/ruby/test_gc.rb
View File

@ -304,6 +304,11 @@ class TestGc < Test::Unit::TestCase
end
def test_gc_parameter
env = {
"RUBY_GC_HEAP_INIT_SLOTS" => "100"
}
assert_in_out_err([env, "-e", "exit"], "", [], [], "[Bug #19284]")
env = {
"RUBY_GC_MALLOC_LIMIT" => "60000000",
"RUBY_GC_HEAP_INIT_SLOTS" => "100000"