Reject the locale infinity symbol in DoubleValidator and FloatValidator

Author: sahvx655-wq

src/main/java/org/apache/commons/validator/routines/DoubleValidator.java

@@ -193,10 +193,16 @@ public boolean minValue(final Double value, final double min) {
      */
     @Override
     protected Object processParsedValue(final Object value, final Format formatter) {
+        final double doubleValue = ((Number) value).doubleValue();
+        // The "Infinity"/"-Infinity" strings throw a ParseException, but the locale infinity
+        // symbol parses through to an infinite value; reject it so the two paths are consistent.
+        if (Double.isInfinite(doubleValue)) {
+            return null;
+        }
         if (value instanceof Double) {
             return value;
         }
-        return Double.valueOf(((Number) value).doubleValue());
+        return Double.valueOf(doubleValue);
 
     }
 

src/main/java/org/apache/commons/validator/routines/FloatValidator.java

@@ -197,6 +197,11 @@ protected Object processParsedValue(final Object value, final Format formatter)
 
         final double doubleValue = ((Number) value).doubleValue();
 
+        // The "Infinity"/"-Infinity" strings throw a ParseException, but the locale infinity
+        // symbol parses through to an infinite value; reject it so the two paths are consistent.
+        if (Double.isInfinite(doubleValue)) {
+            return null;
+        }
         if (doubleValue > 0) {
             if (doubleValue < Float.MIN_VALUE || doubleValue > Float.MAX_VALUE) {
                 return null;

src/test/java/org/apache/commons/validator/routines/DoubleValidatorTest.java

@@ -22,6 +22,7 @@
 import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
+import java.text.DecimalFormatSymbols;
 import java.util.Locale;
 
 import org.junit.jupiter.api.BeforeEach;
@@ -167,6 +168,20 @@ void testDoubleValidateSpecialValuesJava8() {
         assertFalse(validator.isValid(Double.toString(Double.NEGATIVE_INFINITY)));
     }
 
+    /**
+     * Test the locale infinity symbol is rejected. Unlike the "Infinity" string, the symbol parses through to an infinite value, so it is rejected to keep both
+     * paths consistent. NaN is unaffected.
+     */
+    @Test
+    void testDoubleValidateInfinitySymbol() {
+        final DoubleValidator validator = DoubleValidator.getInstance();
+        final String infinity = new DecimalFormatSymbols(Locale.US).getInfinity();
+        assertNull(validator.validate(infinity, Locale.US), "validate(infinity symbol)");
+        assertNull(validator.validate("-" + infinity, Locale.US), "validate(-infinity symbol)");
+        assertFalse(validator.isValid(infinity, Locale.US), "isValid(infinity symbol)");
+        assertFalse(validator.isValid("-" + infinity, Locale.US), "isValid(-infinity symbol)");
+    }
+
     /**
      * Test DoubleValidator validate Methods
      */

src/test/java/org/apache/commons/validator/routines/FloatValidatorTest.java

@@ -23,6 +23,7 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.text.DecimalFormat;
+import java.text.DecimalFormatSymbols;
 import java.util.Locale;
 
 import org.junit.jupiter.api.BeforeEach;
@@ -150,6 +151,20 @@ void testFloatSmallestValues() {
         assertFalse(FloatValidator.getInstance().isValid(strTooSmallNegative, pattern), "Too small -ve");
     }
 
+    /**
+     * Test the locale infinity symbol is rejected. Unlike the "Infinity" string, the symbol parses through to an infinite value, so it is rejected to keep both
+     * paths consistent. NaN is unaffected.
+     */
+    @Test
+    void testFloatValidateInfinitySymbol() {
+        final FloatValidator validator = FloatValidator.getInstance();
+        final String infinity = new DecimalFormatSymbols(Locale.US).getInfinity();
+        assertNull(validator.validate(infinity, Locale.US), "validate(infinity symbol)");
+        assertNull(validator.validate("-" + infinity, Locale.US), "validate(-infinity symbol)");
+        assertFalse(validator.isValid(infinity, Locale.US), "isValid(infinity symbol)");
+        assertFalse(validator.isValid("-" + infinity, Locale.US), "isValid(-infinity symbol)");
+    }
+
     /**
      * Test FloatValidator validate Methods
      */