Merge branch 'odin-lang:master' into os-get-current-directory-allocat…

…or-arg
odin-lang · Sep 18, 2024 · 80622bc · 80622bc
2 parents 18fd1fe + 7491b3c
commit 80622bc
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/core/os/os2/allocators.odin b/core/os/os2/allocators.odin
@@ -22,9 +22,14 @@ global_default_temp_allocator_index: uint
 
 @(require_results)
 temp_allocator :: proc() -> runtime.Allocator {
+	arena := &global_default_temp_allocator_arenas[global_default_temp_allocator_index]
+	if arena.backing_allocator.procedure == nil {
+		arena.backing_allocator = heap_allocator()
+	}
+
 	return runtime.Allocator{
 		procedure = temp_allocator_proc,
-		data      = &global_default_temp_allocator_arenas[global_default_temp_allocator_index],
+		data      = arena,
 	}
 }