aboutsummaryrefslogtreecommitdiff
path: root/core/mem/virtual/virtual_platform.odin
diff options
context:
space:
mode:
authorgingerBill <gingerBill@users.noreply.github.com>2025-03-20 17:20:26 +0000
committerGitHub <noreply@github.com>2025-03-20 17:20:26 +0000
commit539e9bd2e3409300a80109ea6b4c015a9dabdb0a (patch)
tree4c57efdaf2735b543a1068afdf051788fe0e64fe /core/mem/virtual/virtual_platform.odin
parentbadd2c90f9d168851bb3ee8b098392ef7a3f04ca (diff)
parentcae3f13d9f61fa4ec82dbdcfe3c9bcb6f9f8d344 (diff)
Merge pull request #4836 from laytan/fix-wrong-out-of-memory
fix wrong out of memory in edge cases, just try allocate from block for one source of truth
Diffstat (limited to 'core/mem/virtual/virtual_platform.odin')
-rw-r--r--core/mem/virtual/virtual_platform.odin4
1 files changed, 3 insertions, 1 deletions
diff --git a/core/mem/virtual/virtual_platform.odin b/core/mem/virtual/virtual_platform.odin
index 54c42ce4b..31e9cfca8 100644
--- a/core/mem/virtual/virtual_platform.odin
+++ b/core/mem/virtual/virtual_platform.odin
@@ -15,7 +15,9 @@ platform_memory_alloc :: proc "contextless" (to_commit, to_reserve: uint) -> (bl
to_commit = clamp(to_commit, size_of(Platform_Memory_Block), total_to_reserved)
data := reserve(total_to_reserved) or_return
- commit(raw_data(data), to_commit)
+
+ commit_err := commit(raw_data(data), to_commit)
+ assert_contextless(commit_err == nil)
block = (^Platform_Memory_Block)(raw_data(data))
block.committed = to_commit