fix #164: NRE on deserializing missing field with JsonIgnoreCondition…

….WhenWritingNull
Tarmil · Jul 7, 2023 · fca5a58 · fca5a58
1 parent c08a9e3
commit fca5a58
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/src/FSharp.SystemTextJson/Record.fs b/src/FSharp.SystemTextJson/Record.fs
@@ -27,7 +27,7 @@ type private RecordField
 
     let isSkippableType = isSkippableType fsOptions p.PropertyType
 
-    let canBeSkipped = ignore || ignoreNullValues options || isSkippableType
+    let canBeSkipped = ignore || (ignoreNullValues options && nullValue.IsSome) || isSkippableType
 
     let read =
         let m = p.GetGetMethod()
@@ -226,7 +226,7 @@ type JsonRecordConverter<'T> internal (options: JsonSerializerOptions, fsOptions
                 | _ -> reader.Skip()
             | _ -> ()
 
-        if requiredFieldCount < minExpectedFieldCount && not (ignoreNullValues options) then
+        if requiredFieldCount < minExpectedFieldCount then
             for i in 0 .. fieldCount - 1 do
                 if isNull fields[i] && fieldProps[i].MustBePresent then
                     failf "Missing field for record type %s: %s" recordType.FullName fieldProps[i].Names[0]

diff --git a/tests/FSharp.SystemTextJson.Tests/Test.Record.fs b/tests/FSharp.SystemTextJson.Tests/Test.Record.fs
@@ -300,10 +300,13 @@ module NonStruct =
         Assert.Equal("""{"unignoredX":1}""", actual)
 
     let ignoreNullOptions =
-        JsonFSharpOptions().ToJsonSerializerOptions(IgnoreNullValues = true)
+        JsonFSharpOptions()
+            .WithAllowNullFields()
+            .ToJsonSerializerOptions(IgnoreNullValues = true)
 
     let newIgnoreNullOptions =
         JsonFSharpOptions()
+            .WithAllowNullFields()
             .ToJsonSerializerOptions(DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull)
 
     [<AllowNullLiteral>]
@@ -763,10 +766,13 @@ module Struct =
         Assert.Equal("""{"unignoredX":1}""", actual)
 
     let ignoreNullOptions =
-        JsonFSharpOptions().ToJsonSerializerOptions(IgnoreNullValues = true)
+        JsonFSharpOptions()
+            .WithAllowNullFields()
+            .ToJsonSerializerOptions(IgnoreNullValues = true)
 
     let newIgnoreNullOptions =
         JsonFSharpOptions()
+            .WithAllowNullFields()
             .ToJsonSerializerOptions(DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull)
 
     [<AllowNullLiteral>]