Merge pull request #702 from EdwardCooke/ec-fix673-longminvaluedeseri…

…alize Make long.minvalue deserialize
aaubry · Jul 19, 2022 · 1ca20f4 · 1ca20f4
2 parents 144e385 + fa3ae85
commit 1ca20f4
Show file tree

Hide file tree

Showing 2 changed files with 57 additions and 1 deletion.
diff --git a/YamlDotNet.Test/Serialization/DeserializerTest.cs b/YamlDotNet.Test/Serialization/DeserializerTest.cs
@@ -216,6 +216,49 @@ public void NewLinesInKeys()
             Assert.Equal($"value\na\nb", dictionary.First().Value);
         }
 
+        public static IEnumerable<object[]> DeserializeScalarEdgeCases_TestCases
+        {
+            get
+            {
+                yield return new object[] { byte.MinValue, typeof(byte) };
+                yield return new object[] { byte.MaxValue, typeof(byte) };
+                yield return new object[] { short.MinValue, typeof(short) };
+                yield return new object[] { short.MaxValue, typeof(short) };
+                yield return new object[] { int.MinValue, typeof(int) };
+                yield return new object[] { int.MaxValue, typeof(int) };
+                yield return new object[] { long.MinValue, typeof(long) };
+                yield return new object[] { long.MaxValue, typeof(long) };
+                yield return new object[] { sbyte.MinValue, typeof(sbyte) };
+                yield return new object[] { sbyte.MaxValue, typeof(sbyte) };
+                yield return new object[] { ushort.MinValue, typeof(ushort) };
+                yield return new object[] { ushort.MaxValue, typeof(ushort) };
+                yield return new object[] { uint.MinValue, typeof(uint) };
+                yield return new object[] { uint.MaxValue, typeof(uint) };
+                yield return new object[] { ulong.MinValue, typeof(ulong) };
+                yield return new object[] { ulong.MaxValue, typeof(ulong) };
+                yield return new object[] { decimal.MinValue, typeof(decimal) };
+                yield return new object[] { decimal.MaxValue, typeof(decimal) };
+                yield return new object[] { char.MaxValue, typeof(char) };
+
+#if NETCOREAPP3_1_OR_GREATER
+                yield return new object[] { float.MinValue, typeof(float) };
+                yield return new object[] { float.MaxValue, typeof(float) };
+                yield return new object[] { double.MinValue, typeof(double) };
+                yield return new object[] { double.MaxValue, typeof(double) };
+#endif
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(DeserializeScalarEdgeCases_TestCases))]
+        public void DeserializeScalarEdgeCases(IConvertible value, Type type)
+        {
+            var deserializer = new DeserializerBuilder().Build();
+            var result = deserializer.Deserialize(value.ToString(), type);
+
+            result.Should().Be(value);
+        }
+
         public class Test
         {
             public string Value { get; set; }

diff --git a/YamlDotNet/Serialization/NodeDeserializers/ScalarNodeDeserializer.cs b/YamlDotNet/Serialization/NodeDeserializers/ScalarNodeDeserializer.cs
@@ -253,7 +253,20 @@ private static object DeserializeIntegerHelper(TypeCode typeCode, string value)
 
             if (isNegative)
             {
-                return CastInteger(checked(-(long)result), typeCode);
+                long toCast;
+
+                // we do this because abs(long.minvalue) is 1 more than long.maxvalue.
+                if (result == 9223372036854775808) // abs(long.minvalue) => ulong
+                {
+                    toCast = long.MinValue;
+                }
+                else
+                {
+                    // this will throw if it's too big.
+                    toCast = checked(-(long)result);
+                }
+
+                return CastInteger(toCast, typeCode);
             }
             else
             {