Add support for parsing large integers causing overflows in longs

mythz · mythz · commit 3aba12dcf98a · 2025-05-17T16:05:23.000+08:00
diff --git a/ServiceStack.Text/src/ServiceStack.Text/DefaultMemory.cs b/ServiceStack.Text/src/ServiceStack.Text/DefaultMemory.cs
@@ -1016,7 +1016,7 @@ internal static ulong ParseUInt64(ReadOnlySpan<char> value)
                     {
                         state = ParseState.TrailingWhite;
                     }
-                    else if (c > '0' && c <= '9')
+                    else if (c is > '0' and <= '9')
                     {
                         result = (ulong) (c - '0');
                         state = ParseState.Number;
@@ -1026,15 +1026,14 @@ internal static ulong ParseUInt64(ReadOnlySpan<char> value)
 
                     break;
                 case ParseState.Number:
-                    if (c >= '0' && c <= '9')
+                    if (c is >= '0' and <= '9')
                     {
                         checked
                         {
                             result = 10 * result + (ulong) (c - '0');
                         }
 
-                        if (result > maxValue
-                           ) //check only minvalue, because in absolute value it's greater than maxvalue
+                        if (result > maxValue) //check only minvalue, because in absolute value it's greater than maxvalue
                             throw DefaultMemory.CreateOverflowException(maxValue);
                     }
                     else if (JsonUtils.IsWhiteSpace(c))
diff --git a/ServiceStack.Text/src/ServiceStack.Text/StringSpanExtensions.cs b/ServiceStack.Text/src/ServiceStack.Text/StringSpanExtensions.cs
@@ -183,11 +183,38 @@ public static Guid ParseGuid(this ReadOnlySpan<char> value) =>
     public static object ParseSignedInteger(this ReadOnlySpan<char> value)
     {
         var longValue = ParseInt64(value);
-        if (longValue >= int.MinValue && longValue <= int.MaxValue)
+        if (longValue is >= int.MinValue and <= int.MaxValue)
             return (int)longValue;
         return longValue;
     }
         
+    public static object ParseUnsignedInteger(this ReadOnlySpan<char> value)
+    {
+        var longValue = ParseUInt64(value);
+        if (longValue <= uint.MaxValue)
+            return (uint)longValue;
+        return longValue;
+    }
+
+    public static object ParseInteger(this ReadOnlySpan<char> value)
+    {
+        try
+        {
+            return ParseSignedInteger(value);
+        }
+        catch (OverflowException)
+        {
+            try
+            {
+                return ParseUInt64(value);
+            }
+            catch (OverflowException)
+            {
+                return ParseDecimal(value);
+            }
+        }
+    }
+    
     public static bool TryReadLine(this ReadOnlySpan<char> text, out ReadOnlySpan<char> line, ref int startIndex)
     {
         if (startIndex >= text.Length)
diff --git a/ServiceStack/src/ServiceStack.Common/Script/JsToken.cs b/ServiceStack/src/ServiceStack.Common/Script/JsToken.cs
@@ -484,7 +484,7 @@ public static ReadOnlySpan<char> ParseJsToken(this ReadOnlySpan<char> literal, o
             if ((firstDecimalPos > 0 && firstDecimalPos < i) || hasExponent)
                 token = new JsLiteral(ScriptConfig.ParseRealNumber(numLiteral));
             else
-                token = new JsLiteral(numLiteral.ParseSignedInteger());
+                token = new JsLiteral(numLiteral.ParseInteger());
 
             if (hasMemberSuffix) 
             {

Original file line number	Diff line number	Diff line change
`@@ -1016,7 +1016,7 @@ internal static ulong ParseUInt64(ReadOnlySpan<char> value)`
`1016`	`1016`	`{`
`1017`	`1017`	`state = ParseState.TrailingWhite;`
`1018`	`1018`	`}`
`1019`		`- else if (c > '0' && c <= '9')`
	`1019`	`+ else if (c is > '0' and <= '9')`
`1020`	`1020`	`{`
`1021`	`1021`	`result = (ulong) (c - '0');`
`1022`	`1022`	`state = ParseState.Number;`
`@@ -1026,15 +1026,14 @@ internal static ulong ParseUInt64(ReadOnlySpan<char> value)`
`1026`	`1026`
`1027`	`1027`	`break;`
`1028`	`1028`	`case ParseState.Number:`
`1029`		`- if (c >= '0' && c <= '9')`
	`1029`	`+ if (c is >= '0' and <= '9')`
`1030`	`1030`	`{`
`1031`	`1031`	`checked`
`1032`	`1032`	`{`
`1033`	`1033`	`result = 10 * result + (ulong) (c - '0');`
`1034`	`1034`	`}`
`1035`	`1035`
`1036`		`- if (result > maxValue`
`1037`		`- ) //check only minvalue, because in absolute value it's greater than maxvalue`
	`1036`	`+ if (result > maxValue) //check only minvalue, because in absolute value it's greater than maxvalue`
`1038`	`1037`	`throw DefaultMemory.CreateOverflowException(maxValue);`
`1039`	`1038`	`}`
`1040`	`1039`	`else if (JsonUtils.IsWhiteSpace(c))`
Original file line number	Diff line number	Diff line change
`@@ -484,7 +484,7 @@ public static ReadOnlySpan<char> ParseJsToken(this ReadOnlySpan<char> literal, o`
`484`	`484`	`if ((firstDecimalPos > 0 && firstDecimalPos < i) \|\| hasExponent)`
`485`	`485`	`token = new JsLiteral(ScriptConfig.ParseRealNumber(numLiteral));`
`486`	`486`	`else`
`487`		`- token = new JsLiteral(numLiteral.ParseSignedInteger());`
	`487`	`+ token = new JsLiteral(numLiteral.ParseInteger());`
`488`	`488`
`489`	`489`	`if (hasMemberSuffix)`
`490`	`490`	`{`