From 942e91f94c47fc6057da06f4aa320f9a150adfe1 Mon Sep 17 00:00:00 2001 From: Karl Zylinski Date: Wed, 1 Nov 2023 00:46:01 +0100 Subject: [PATCH] Added temp allocator guard to json.marshal, in case we temp alloc when sorting map kesy --- core/encoding/json/marshal.odin | 3 +++ 1 file changed, 3 insertions(+) diff --git a/core/encoding/json/marshal.odin b/core/encoding/json/marshal.odin index 80b2e4dd4..9ef78b95d 100644 --- a/core/encoding/json/marshal.odin +++ b/core/encoding/json/marshal.odin @@ -83,6 +83,9 @@ marshal_to_writer :: proc(w: io.Writer, v: any, opt: ^Marshal_Options) -> (err: return } + // temp guard in case we are sorting map keys, which will use temp allocations + runtime.DEFAULT_TEMP_ALLOCATOR_TEMP_GUARD() + ti := runtime.type_info_base(type_info_of(v.id)) a := any{v.data, ti.id}