Merge pull request aaubry#539 from brendandburns/master

Fix deserialization for Nullable types.
cloudguard-so · Oct 26, 2020 · 7714d0d · 7714d0d
2 parents 2e4e5bb + 816c3a2
commit 7714d0d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/YamlDotNet.Test/Serialization/SerializationTests.cs b/YamlDotNet.Test/Serialization/SerializationTests.cs
@@ -137,6 +137,14 @@ public void DeserializeScalarOctalNumber()
             result.Should().Be(29418);
         }
 
+        [Fact]
+        public void DeserializeNullableScalarOctalNumber()
+        {
+            var result = Deserializer.Deserialize<int?>(UsingReaderFor("+071_352"));
+
+            result.Should().Be(29418);
+        }
+
         [Fact]
         public void DeserializeScalarHexNumber()
         {

diff --git a/YamlDotNet/Serialization/NodeDeserializers/ScalarNodeDeserializer.cs b/YamlDotNet/Serialization/NodeDeserializers/ScalarNodeDeserializer.cs
@@ -48,7 +48,8 @@ bool INodeDeserializer.Deserialize(IParser parser, Type expectedType, Func<IPars
             }
             else
             {
-                var typeCode = expectedType.GetTypeCode();
+                var underlyingType = Nullable.GetUnderlyingType(expectedType);
+                var typeCode = underlyingType != null ? underlyingType.GetTypeCode() : expectedType.GetTypeCode();
                 switch (typeCode)
                 {
                     case TypeCode.Boolean: