浏览代码

Merge pull request #8195 from HannahShiSFB/gRPC-Ruby-issue-on-Windows

[Ruby] Fix: (SIGSEGV) gRPC-Ruby issue on Windows. memory alloc infinite recursion/run out of memory
Joshua Haberman 4 年之前
父节点
当前提交
7165c34606
共有 1 个文件被更改,包括 1 次插入1 次删除
  1. 1 1
      ruby/ext/google/protobuf_c/upb.c

+ 1 - 1
ruby/ext/google/protobuf_c/upb.c

@@ -2357,7 +2357,7 @@ static void upb_arena_addblock(upb_arena *a, void *ptr, size_t size,
 }
 }
 
 
 static mem_block *upb_arena_allocblock(upb_arena *a, size_t size) {
 static mem_block *upb_arena_allocblock(upb_arena *a, size_t size) {
-  size_t block_size = UPB_MAX(size, a->next_block_size) + sizeof(mem_block);
+  size_t block_size = UPB_MAX(size, a->next_block_size) + _upb_arena_alignup(sizeof(mem_block));
   mem_block *block = upb_malloc(a->block_alloc, block_size);
   mem_block *block = upb_malloc(a->block_alloc, block_size);
 
 
   if (!block) {
   if (!block) {