aboutsummaryrefslogtreecommitdiff
path: root/core/encoding
diff options
context:
space:
mode:
authorJeroen van Rijn <Kelimion@users.noreply.github.com>2025-10-06 13:00:28 +0200
committerGitHub <noreply@github.com>2025-10-06 13:00:28 +0200
commit9a0b0bc3ff8b8fe22499fd6342e6fde7740d242b (patch)
treeff573c1d440fc94215a19d0619931e3220209ce9 /core/encoding
parent0f97382fa3e46da80705c00dfe02f3deb9562e4f (diff)
parent69ad94d8a8c6b96952224faa259a4edbce8eabb0 (diff)
Merge pull request #4896 from cstrachan88/master
Fixed json null value parsing
Diffstat (limited to 'core/encoding')
-rw-r--r--core/encoding/json/marshal.odin6
1 files changed, 5 insertions, 1 deletions
diff --git a/core/encoding/json/marshal.odin b/core/encoding/json/marshal.odin
index cdb00a354..e563c326a 100644
--- a/core/encoding/json/marshal.odin
+++ b/core/encoding/json/marshal.odin
@@ -176,7 +176,11 @@ marshal_to_writer :: proc(w: io.Writer, v: any, opt: ^Marshal_Options) -> (err:
return .Unsupported_Type
case runtime.Type_Info_Pointer:
- return .Unsupported_Type
+ if v.id == typeid_of(Null) {
+ io.write_string(w, "null") or_return
+ } else {
+ return .Unsupported_Type
+ }
case runtime.Type_Info_Multi_Pointer:
return .Unsupported_Type