When alloc size is too large, only allocate struct

eightbitraptor · byroot · commit 6fe46ff96721 · 2023-06-12T16:20:05.000+02:00
diff --git a/struct.c b/struct.c
@@ -849,7 +849,7 @@ struct_alloc(VALUE klass)
         return (VALUE)st;
     }
     else {
-        NEWOBJ_OF(st, struct RStruct, klass, flags, embedded_size, 0);
+        NEWOBJ_OF(st, struct RStruct, klass, flags, sizeof(struct RStruct), 0);
 
         st->as.heap.ptr = struct_heap_alloc((VALUE)st, n);
         rb_mem_clear((VALUE *)st->as.heap.ptr, n);
diff --git a/test/ruby/test_struct.rb b/test/ruby/test_struct.rb
@@ -41,6 +41,14 @@ def test_morethan10members
     end
   end
 
+  def test_larger_than_largest_pool
+    count = (GC::INTERNAL_CONSTANTS[:RVARGC_MAX_ALLOCATE_SIZE] / RbConfig::SIZEOF["void*"]) + 1
+    list = Array(0..count)
+    klass = @Struct.new(*list.map { |i| :"a_#{i}"})
+    struct = klass.new(*list)
+    assert_equal 0, struct.a_0
+  end
+
   def test_small_structs
     names = [:a, :b, :c, :d]
     1.upto(4) {|n|

Original file line number	Diff line number	Diff line change
`@@ -849,7 +849,7 @@ struct_alloc(VALUE klass)`
`849`	`849`	`return (VALUE)st;`
`850`	`850`	`}`
`851`	`851`	`else {`
`852`		`- NEWOBJ_OF(st, struct RStruct, klass, flags, embedded_size, 0);`
	`852`	`+ NEWOBJ_OF(st, struct RStruct, klass, flags, sizeof(struct RStruct), 0);`
`853`	`853`
`854`	`854`	`st->as.heap.ptr = struct_heap_alloc((VALUE)st, n);`
`855`	`855`	`rb_mem_clear((VALUE *)st->as.heap.ptr, n);`