[bugfix] Fix comparison of NaN values for xs:float and xs:double

eXist-db · Dec 10, 2022 · 185ee37 · 185ee37
1 parent 2d68bc6
commit 185ee37
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/exist-core/src/main/java/org/exist/xquery/value/DoubleValue.java b/exist-core/src/main/java/org/exist/xquery/value/DoubleValue.java
@@ -151,7 +151,11 @@ public boolean isPositive() {
     @Override
     protected @Nullable IntSupplier createComparisonWith(final NumericValue other) {
         final IntSupplier comparison;
-        if (isInfinite() && other.isInfinite() && isPositive() == other.isPositive()) {
+        if (isNaN()) {
+            comparison = () -> Constants.INFERIOR;
+        } else if (other.isNaN()) {
+            comparison = () -> Constants.SUPERIOR;
+        } else if (isInfinite() && other.isInfinite() && isPositive() == other.isPositive()) {
             comparison = () -> Constants.EQUAL;
         } else if (other instanceof IntegerValue) {
             comparison = () -> BigDecimal.valueOf(value).compareTo(new BigDecimal(((IntegerValue)other).value));

diff --git a/exist-core/src/main/java/org/exist/xquery/value/FloatValue.java b/exist-core/src/main/java/org/exist/xquery/value/FloatValue.java
@@ -150,8 +150,11 @@ public boolean isPositive() {
     @Override
     protected @Nullable IntSupplier createComparisonWith(final NumericValue other) {
         final IntSupplier comparison;
-
-        if (isInfinite() && other.isInfinite() && isPositive() == other.isPositive()) {
+        if (isNaN()) {
+            comparison = () -> Constants.INFERIOR;
+        } else if (other.isNaN()) {
+            comparison = () -> Constants.SUPERIOR;
+        } else if (isInfinite() && other.isInfinite() && isPositive() == other.isPositive()) {
             comparison = () -> Constants.EQUAL;
         } else if (other instanceof IntegerValue) {
             comparison = () -> BigDecimal.valueOf(value).compareTo(new BigDecimal(((IntegerValue)other).value));