Skip to content

Commit 738ed9e

Browse files
authored
Merge pull request #368 from roman380/c-gen-malloc-constraint
Enforced bebop_arena_options_t::max_block_size
2 parents ae2eff4 + af95c3e commit 738ed9e

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

Runtime/C/src/bebop.c

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,12 @@ static bebop_arena_block_t *arena_allocate_block(const bebop_arena_t *arena,
1010
size_t capacity = arena->options.initial_block_size;
1111
size_t required = align_size(min_size, BEBOP_ARENA_DEFAULT_ALIGNMENT);
1212

13-
if (capacity < required) {
13+
if (required > arena->options.max_block_size)
14+
return NULL;
15+
if (capacity < required)
1416
capacity = required;
15-
}
16-
17-
if (capacity > arena->options.max_block_size &&
18-
required <= arena->options.max_block_size) {
17+
if (capacity > arena->options.max_block_size)
1918
capacity = arena->options.max_block_size;
20-
}
2119

2220
size_t total_size = sizeof(bebop_arena_block_t) + capacity;
2321

0 commit comments

Comments
 (0)