Merge pull request #392 from dtolnay/positivenan

Ensure that .nan deserialization produces positive NaN
dtolnay · Oct 25, 2023 · d094ba1 · d094ba1
2 parents 81b2d76 + fe45569
commit d094ba1
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/src/de.rs b/src/de.rs
@@ -1079,7 +1079,7 @@ pub(crate) fn parse_f64(scalar: &str) -> Option<f64> {
         return Some(f64::NEG_INFINITY);
     }
     if let ".nan" | ".NaN" | ".NAN" = scalar {
-        return Some(f64::NAN);
+        return Some(f64::NAN.copysign(1.0));
     }
     if let Ok(float) = unpositive.parse::<f64>() {
         if float.is_finite() {

diff --git a/tests/test_de.rs b/tests/test_de.rs
@@ -690,6 +690,7 @@ fn test_parse_number() {
 
     let n = ".nan".parse::<Number>().unwrap();
     assert_eq!(n, Number::from(f64::NAN));
+    assert!(n.as_f64().unwrap().is_sign_positive());
 
     let n = ".inf".parse::<Number>().unwrap();
     assert_eq!(n, Number::from(f64::INFINITY));

diff --git a/tests/test_value.rs b/tests/test_value.rs
@@ -20,7 +20,7 @@ fn test_nan() {
     assert!(neg_fake_nan.is_string());
 
     let significand_mask = 0xF_FFFF_FFFF_FFFF;
-    let bits = (f64::NAN.to_bits() ^ significand_mask) | 1;
+    let bits = (f64::NAN.copysign(1.0).to_bits() ^ significand_mask) | 1;
     let different_pos_nan = Value::Number(Number::from(f64::from_bits(bits)));
     assert_eq!(pos_nan, different_pos_nan);
 }