Fixing the float/double parsing logic to handle exponents that are too large/small (dotnet#23043)

tannergooding · stephentoub · commit 8062156a3b62 · 2019-03-06T15:00:35.000-08:00
* Fixing the float/double parsing logic to handle exponents that are too large/small

* Fixing the debug assert to use &gt;= and &lt;=

* Fixing the max exponents to be +1 to match what scale uses.

Signed-off-by: dotnet-bot &lt;anirudhagnihotry098@gmail.com&gt;
diff --git a/src/Common/src/CoreLib/System/Number.NumberToFloatingPointBits.cs b/src/Common/src/CoreLib/System/Number.NumberToFloatingPointBits.cs
@@ -333,6 +333,9 @@ private static ulong NumberToFloatingPointBits(ref NumberBuffer number, in Float
         {
             Debug.Assert(number.GetDigitsPointer()[0] != '0');
 
+            Debug.Assert(number.Scale <= FloatingPointMaxExponent);
+            Debug.Assert(number.Scale >= FloatingPointMinExponent);
+
             // The input is of the form 0.Mantissa x 10^Exponent, where 'Mantissa' are
             // the decimal digits of the mantissa and 'Exponent' is the decimal exponent.
             // We decompose the mantissa into two parts: an integer part and a fractional
diff --git a/src/Common/src/CoreLib/System/Number.Parsing.cs b/src/Common/src/CoreLib/System/Number.Parsing.cs
@@ -32,6 +32,15 @@ internal partial class Number
         private const int Int64Precision = 19;
         private const int UInt64Precision = 20;
 
+        private const int DoubleMaxExponent = 309;
+        private const int DoubleMinExponent = -324;
+
+        private const int FloatingPointMaxExponent = DoubleMaxExponent;
+        private const int FloatingPointMinExponent = DoubleMinExponent;
+
+        private const int SingleMaxExponent = 39;
+        private const int SingleMinExponent = -45;
+
         /// <summary>Map from an ASCII char to its hex value, e.g. arr['b'] == 11. 0xFF means it's not a hex digit.</summary>
         internal static ReadOnlySpan<byte> CharToHexLookup => new byte[]
         {
@@ -1964,18 +1973,44 @@ private static Exception GetException(ParsingStatus status, TypeCode type)
         internal static double NumberToDouble(ref NumberBuffer number)
         {
             number.CheckConsistency();
+            double result;
+
+            if (number.Scale > DoubleMaxExponent)
+            {
+                result = double.PositiveInfinity;
+            }
+            else if (number.Scale < DoubleMinExponent)
+            {
+                result = 0;
+            }
+            else
+            {
+                ulong bits = NumberToFloatingPointBits(ref number, in FloatingPointInfo.Double);
+                result = BitConverter.Int64BitsToDouble((long)(bits));
+            }
 
-            ulong bits = NumberToFloatingPointBits(ref number, in FloatingPointInfo.Double);
-            double result = BitConverter.Int64BitsToDouble((long)(bits));
             return number.IsNegative ? -result : result;
         }
 
         internal static float NumberToSingle(ref NumberBuffer number)
         {
             number.CheckConsistency();
+            float result;
+
+            if (number.Scale > SingleMaxExponent)
+            {
+                result = float.PositiveInfinity;
+            }
+            else if (number.Scale < SingleMinExponent)
+            {
+                result = 0;
+            }
+            else
+            {
+                uint bits = (uint)(NumberToFloatingPointBits(ref number, in FloatingPointInfo.Single));
+                result = BitConverter.Int32BitsToSingle((int)(bits));
+            }
 
-            uint bits = (uint)(NumberToFloatingPointBits(ref number, in FloatingPointInfo.Single));
-            float result = BitConverter.Int32BitsToSingle((int)(bits));
             return number.IsNegative ? -result : result;
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -333,6 +333,9 @@ private static ulong NumberToFloatingPointBits(ref NumberBuffer number, in Float`
`333`	`333`	`{`
`334`	`334`	`Debug.Assert(number.GetDigitsPointer()[0] != '0');`
`335`	`335`
	`336`	`+ Debug.Assert(number.Scale <= FloatingPointMaxExponent);`
	`337`	`+ Debug.Assert(number.Scale >= FloatingPointMinExponent);`
	`338`	`+`
`336`	`339`	`// The input is of the form 0.Mantissa x 10^Exponent, where 'Mantissa' are`
`337`	`340`	`// the decimal digits of the mantissa and 'Exponent' is the decimal exponent.`
`338`	`341`	`// We decompose the mantissa into two parts: an integer part and a fractional`