Fix TimeSpanConverter overflow

Author: mythz

src/ServiceStack.Text/Support/TimeSpanConverter.cs

@@ -14,12 +14,12 @@ public static string ToXsdDuration(TimeSpan timeSpan)
 
             double ticks = Math.Abs(timeSpan.Ticks);
             double totalSeconds = ticks / TimeSpan.TicksPerSecond;
-            int wholeSeconds = (int) totalSeconds;
-            int seconds = wholeSeconds;
-            int sec = (seconds >= 60 ? seconds % 60 : seconds);
-            int min = (seconds = (seconds / 60)) >= 60 ? seconds % 60 : seconds;
-            int hours = (seconds = (seconds / 60)) >= 24 ? seconds % 24 : seconds;
-            int days = seconds / 24;
+            long wholeSeconds = (long) totalSeconds;
+            long seconds = wholeSeconds;
+            long sec = (seconds >= 60 ? seconds % 60 : seconds);
+            long min = (seconds = (seconds / 60)) >= 60 ? seconds % 60 : seconds;
+            long hours = (seconds = (seconds / 60)) >= 24 ? seconds % 24 : seconds;
+            long days = seconds / 24;
             double remainingSecs = sec + (totalSeconds - wholeSeconds);
 
             if (days > 0)
@@ -51,11 +51,11 @@ public static string ToXsdDuration(TimeSpan timeSpan)
 
         public static TimeSpan FromXsdDuration(string xsdDuration)
         {
-            int days = 0;
-            int hours = 0;
-            int minutes = 0;
+            long days = 0;
+            long hours = 0;
+            long minutes = 0;
             decimal seconds = 0;
-            int sign = 1;
+            long sign = 1;
 
             if (xsdDuration.StartsWith("-", StringComparison.Ordinal))
             {
@@ -70,33 +70,29 @@ public static TimeSpan FromXsdDuration(string xsdDuration)
             string[] d = t[0].SplitOnFirst('D');
             if (d.Length == 2)
             {
-                int day;
-                if (int.TryParse(d[0], out day))
+                if (long.TryParse(d[0], out var day))
                     days = day;
             }
             if (hasTime)
             {
                 string[] h = t[1].SplitOnFirst('H');
                 if (h.Length == 2)
                 {
-                    int hour;
-                    if (int.TryParse(h[0], out hour))
+                    if (long.TryParse(h[0], out var hour))
                         hours = hour;
                 }
 
                 string[] m = h[h.Length - 1].SplitOnFirst('M');
                 if (m.Length == 2)
                 {
-                    int min;
-                    if (int.TryParse(m[0], out min))
+                    if (long.TryParse(m[0], out var min))
                         minutes = min;
                 }
 
                 string[] s = m[m.Length - 1].SplitOnFirst('S');
                 if (s.Length == 2)
                 {
-                    decimal millis;
-                    if (decimal.TryParse(s[0], NumberStyles.AllowDecimalPoint, CultureInfo.InvariantCulture, out millis))
+                    if (decimal.TryParse(s[0], NumberStyles.AllowDecimalPoint, CultureInfo.InvariantCulture, out var millis))
                         seconds = millis;
                 }
             }

tests/ServiceStack.Text.Tests/TimeSpanConverterTests.cs

@@ -17,6 +17,7 @@ public class TimeSpanConverterTests
         private readonly TimeSpan oneMilliSecond = new TimeSpan(0, 0, 0, 0, 1);
         private readonly TimeSpan oneDayHourMinuteSecondMilliSecond = new TimeSpan(1, 1, 1, 1, 1);
         private readonly TimeSpan threeThousandSixHundredAndFiveDays = TimeSpan.FromDays(3605);
+        private readonly TimeSpan ninetyThousandDays = TimeSpan.FromDays(90000);
         private readonly TimeSpan arbitraryTimeSpan = new TimeSpan(1, 2, 3, 4, 567).Add(TimeSpan.FromTicks(1));
 
         [Test]
@@ -48,6 +49,9 @@ public void Can_Serialize_TimeSpan()
 
             Assert.That(TimeSpanConverter.ToXsdDuration(threeThousandSixHundredAndFiveDays), Is.EqualTo("P3605D"));
             Assert.That(TimeSpanConverter.ToXsdDuration(-threeThousandSixHundredAndFiveDays), Is.EqualTo("-P3605D"));
+
+            Assert.That(TimeSpanConverter.ToXsdDuration(ninetyThousandDays), Is.EqualTo("P90000D"));
+            Assert.That(TimeSpanConverter.ToXsdDuration(-ninetyThousandDays), Is.EqualTo("-P90000D"));
         }
 
         [Test]
@@ -80,6 +84,9 @@ public void Can_deserialize_TimeSpan()
 
             Assert.That(TimeSpanConverter.FromXsdDuration("P3605D"), Is.EqualTo(threeThousandSixHundredAndFiveDays));
             Assert.That(TimeSpanConverter.FromXsdDuration("-P3605D"), Is.EqualTo(-threeThousandSixHundredAndFiveDays));
+
+            Assert.That(TimeSpanConverter.FromXsdDuration("P90000D"), Is.EqualTo(ninetyThousandDays));
+            Assert.That(TimeSpanConverter.FromXsdDuration("-P90000D"), Is.EqualTo(-ninetyThousandDays));
         }
 
         [Test]
@@ -111,6 +118,9 @@ public void Can_Serialize_TimeSpan_DifferentCulture()
 
             Assert.That(TimeSpanConverter.ToXsdDuration(threeThousandSixHundredAndFiveDays), Is.EqualTo("P3605D"));
             Assert.That(TimeSpanConverter.ToXsdDuration(-threeThousandSixHundredAndFiveDays), Is.EqualTo("-P3605D"));
+
+            Assert.That(TimeSpanConverter.ToXsdDuration(ninetyThousandDays), Is.EqualTo("P90000D"));
+            Assert.That(TimeSpanConverter.ToXsdDuration(-ninetyThousandDays), Is.EqualTo("-P90000D"));
         }
 
         [Test]
@@ -143,6 +153,9 @@ public void Can_deserialize_TimeSpan_DifferentCulture()
 
             Assert.That(TimeSpanConverter.FromXsdDuration("P3605D"), Is.EqualTo(threeThousandSixHundredAndFiveDays));
             Assert.That(TimeSpanConverter.FromXsdDuration("-P3605D"), Is.EqualTo(-threeThousandSixHundredAndFiveDays));
+
+            Assert.That(TimeSpanConverter.FromXsdDuration("P90000D"), Is.EqualTo(ninetyThousandDays));
+            Assert.That(TimeSpanConverter.FromXsdDuration("-P90000D"), Is.EqualTo(-ninetyThousandDays));
         }
     }
 }