From 581255bf23af90b77bb2b6e2671b40e2b565754e Mon Sep 17 00:00:00 2001
From: Jeroen van Rijn <Kelimion@users.noreply.github.com>
Date: Tue, 19 Apr 2022 20:04:38 +0200
Subject: [PATCH] Fix unmarshal for escaped strings.

---
 core/encoding/json/parser.odin | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/core/encoding/json/parser.odin b/core/encoding/json/parser.odin
index c682ec9bd..0b9a1cf33 100644
--- a/core/encoding/json/parser.odin
+++ b/core/encoding/json/parser.odin
@@ -281,6 +281,11 @@ parse_object :: proc(p: ^Parser) -> (value: Value, err: Error) {
 
 // IMPORTANT NOTE(bill): unquote_string assumes a mostly valid string
 unquote_string :: proc(token: Token, spec: Specification, allocator := context.allocator) -> (value: string, err: Error) {
+	if allocator.data == nil {
+		// We were called from `unmarshal_count_array`, return early.
+		return "", nil
+	}
+
 	get_u2_rune :: proc(s: string) -> rune {
 		if len(s) < 4 || s[0] != '\\' || s[1] != 'x' {
 			return -1