Merge pull request #2838 from GoNZooo/gonz.return-out-of-memory-in-json-parse

fix(json): return `.Out_Of_Memory` when out of memory on parse

1 files changed, 11 insertions, 2 deletions

diff --git a/core/encoding/json/parser.odin b/core/encoding/json/parser.odin
index bc381efee..6faaf3f32 100644
--- a/core/encoding/json/parser.odin
+++ b/core/encoding/json/parser.odin
@@ -263,8 +263,17 @@ parse_object_body :: proc(p: ^Parser, end_token: Token_Kind) -> (obj: Object, er
 			return
 		}
 
-		obj[key] = elem
-		
+		// NOTE(gonz): There are code paths for which this traversal ends up
+		// inserting empty key/values into the object and for those we do not
+		// want to allocate anything
+		if key != "" {
+			reserve_error := reserve(&obj, len(obj) + 1)
+			if reserve_error == mem.Allocator_Error.Out_Of_Memory {
+				return nil, .Out_Of_Memory
+			}
+			obj[key] = elem
+		}
+
 		if parse_comma(p) {
 			break
 		}