Skip to content

reject NaN and infinity in double and float validators #384

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sahvx655-wq wants to merge 1 commit into
base: master
Choose a base branch
from
+34 −1
Open

reject NaN and infinity in double and float validators #384

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/main/java/org/apache/commons/validator/routines/DoubleValidator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,10 +193,14 @@ 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();
if (Double.isNaN(doubleValue) || Double.isInfinite(doubleValue)) {
return null; // NaN and the infinity symbol are not valid numbers
}
if (value instanceof Double) {
return value;
}
return Double.valueOf(((Number) value).doubleValue());
return Double.valueOf(doubleValue);

}

Expand Down
3 changes: 3 additions & 0 deletions src/main/java/org/apache/commons/validator/routines/FloatValidator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,9 @@ protected Object processParsedValue(final Object value, final Format formatter)

final double doubleValue = ((Number) value).doubleValue();

if (Double.isNaN(doubleValue) || Double.isInfinite(doubleValue)) {
return null; // NaN and the infinity symbol are not valid numbers
}
if (doubleValue > 0) {
if (doubleValue < Float.MIN_VALUE || doubleValue > Float.MAX_VALUE) {
return null;
Expand Down
13 changes: 13 additions & 0 deletions src/test/java/org/apache/commons/validator/routines/DoubleValidatorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,4 +133,17 @@ void testDoubleValidatorMethods() {
assertFalse(DoubleValidator.getInstance().isValid(xxxx, pattern), "isValid(B) pattern");
assertFalse(DoubleValidator.getInstance().isValid(patternVal, pattern, Locale.GERMAN), "isValid(B) both");
}

/**
* Test NaN and infinity symbols are rejected.
*/
@Test
void testNonFinite() {
final DoubleValidator validator = DoubleValidator.getInstance();
assertNull(validator.validate("NaN", null, Locale.US), "validate(NaN)");
assertNull(validator.validate("∞", null, Locale.US), "validate(Infinity)");
assertNull(validator.validate("-∞", null, Locale.US), "validate(-Infinity)");
assertFalse(validator.isValid("NaN", null, Locale.US), "isValid(NaN)");
assertFalse(validator.isValid("∞", null, Locale.US), "isValid(Infinity)");
}
}
13 changes: 13 additions & 0 deletions src/test/java/org/apache/commons/validator/routines/FloatValidatorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,4 +163,17 @@ void testFloatValidatorMethods() {
assertFalse(FloatValidator.getInstance().isValid(xxxx, pattern), "isValid(B) pattern");
assertFalse(FloatValidator.getInstance().isValid(patternVal, pattern, Locale.GERMAN), "isValid(B) both");
}

/**
* Test NaN and infinity symbols are rejected.
*/
@Test
void testNonFinite() {
final FloatValidator validator = FloatValidator.getInstance();
assertNull(validator.validate("NaN", null, Locale.US), "validate(NaN)");
assertNull(validator.validate("∞", null, Locale.US), "validate(Infinity)");
assertNull(validator.validate("-∞", null, Locale.US), "validate(-Infinity)");
assertFalse(validator.isValid("NaN", null, Locale.US), "isValid(NaN)");
assertFalse(validator.isValid("∞", null, Locale.US), "isValid(Infinity)");
}
}