-Fixed deserializing large nullable UInt64 values

JamesNK · Feb 25, 2015 · 376ab4d · 376ab4d
1 parent dd611a9
commit 376ab4d
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 1 deletion.
diff --git a/Src/Newtonsoft.Json.Tests/Serialization/JsonSerializerTest.cs b/Src/Newtonsoft.Json.Tests/Serialization/JsonSerializerTest.cs
@@ -8588,6 +8588,28 @@ public void DeserializedDerivedWithPrivate()
             Assert.AreEqual("derived", d.DerivedProperty);
         }
 
+        [Test]
+        public void DeserializeNullableUnsignedLong()
+        {
+            NullableLongTestClass instance = new NullableLongTestClass
+            {
+                Value = ulong.MaxValue
+            };
+            string output = JsonConvert.SerializeObject(instance);
+            NullableLongTestClass result = JsonConvert.DeserializeObject<NullableLongTestClass>(output);
+
+            Assert.AreEqual(ulong.MaxValue, result.Value);
+        }
+
+        public class NullableLongTestClass
+        {
+            public ulong? Value
+            {
+                get;
+                set;
+            }
+        }
+
 #if !NETFX_CORE
         [Test]
         public void MailMessageConverterTest()

diff --git a/Src/Newtonsoft.Json/Serialization/JsonSerializerInternalReader.cs b/Src/Newtonsoft.Json/Serialization/JsonSerializerInternalReader.cs
@@ -862,7 +862,7 @@ private object EnsureType(JsonReader reader, object value, CultureInfo culture,
 
 #if !(PORTABLE || PORTABLE40 || NET35 || NET20)
                         if (value is BigInteger)
-                            return ConvertUtils.FromBigInteger((BigInteger)value, targetType);
+                            return ConvertUtils.FromBigInteger((BigInteger)value, contract.NonNullableUnderlyingType);
 #endif
 
                         // this won't work when converting to a custom IConvertible