From cc3675833771831c55c59ff295050fff0fea44d5 Mon Sep 17 00:00:00 2001 From: Brendan Hansen Date: Fri, 15 May 2020 14:50:26 -0500 Subject: [PATCH] Small bug / performance fix --- bh.h | 9 +++++---- onyx | Bin 50624 -> 50624 bytes 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/bh.h b/bh.h index 1febb5f1..78e91d5e 100644 --- a/bh.h +++ b/bh.h @@ -658,17 +658,18 @@ BH_ALLOCATOR_PROC(bh_alloc_nofree_allocator_proc) { switch (action) { case bh_allocator_action_alloc: { - size = bh__align(size, alignment); - retval = alloc_nf->next_allocation; + size = bh__align(size, alignment); alloc_nf->next_allocation = bh_pointer_add(alloc_nf->next_allocation, size); - alloc_nf->size += size; - if (alloc_nf->size > alloc_nf->total_size) { + + if (alloc_nf->size + size >= alloc_nf->total_size) { // Out of memory fprintf(stderr, "NoFree allocator out of memory\n"); return NULL; } + + alloc_nf->size += size; } break; case bh_allocator_action_resize: { diff --git a/onyx b/onyx index 7191babc8a9c7e41196ef1c6f726eaaa76abdca1..b8911011cf089071f0bbd84ada557389a703a101 100755 GIT binary patch delta 6854 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 Vbk|oMm+?cy=ITVosJ{B@{{eO6tK$Fw delta 6839 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