Fix isPositive() with NaN

julienfalque · julienfalque · commit 531351863179 · 2022-02-21T18:13:21.000+01:00
diff --git a/php_decimal.c b/php_decimal.c
@@ -2373,7 +2373,10 @@ PHP_DECIMAL_ARGINFO_END()
 PHP_DECIMAL_METHOD(isPositive)
 {
     PHP_DECIMAL_PARAMS_PARSE_NONE();
-    RETURN_BOOL(mpd_ispositive(THIS_MPD()));
+
+    mpd_t *mpd = THIS_MPD();
+
+    RETURN_BOOL(!mpd_isnan(mpd) && mpd_ispositive(mpd));
 }
 
 /**
@@ -2384,7 +2387,10 @@ PHP_DECIMAL_ARGINFO_END()
 PHP_DECIMAL_METHOD(isNegative)
 {
     PHP_DECIMAL_PARAMS_PARSE_NONE();
-    RETURN_BOOL(mpd_isnegative(THIS_MPD()));
+
+    mpd_t *mpd = THIS_MPD();
+
+    RETURN_BOOL(!mpd_isnan(mpd) && mpd_isnegative(mpd));
 }
 
 /**
diff --git a/tests/php7/methods/isPositive.phpt b/tests/php7/methods/isPositive.phpt
@@ -37,7 +37,7 @@ $tests = [
     ["-2.5",    false],
     ["-3.5",    false],
 
-    [ "NAN",    true],
+    [ "NAN",    false],
     [ "INF",    true],
     ["-INF",    false],
 ];

Original file line number	Diff line number	Diff line change
`@@ -2373,7 +2373,10 @@ PHP_DECIMAL_ARGINFO_END()`
`2373`	`2373`	`PHP_DECIMAL_METHOD(isPositive)`
`2374`	`2374`	`{`
`2375`	`2375`	`PHP_DECIMAL_PARAMS_PARSE_NONE();`
`2376`		`- RETURN_BOOL(mpd_ispositive(THIS_MPD()));`
	`2376`	`+`
	`2377`	`+ mpd_t *mpd = THIS_MPD();`
	`2378`	`+`
	`2379`	`+ RETURN_BOOL(!mpd_isnan(mpd) && mpd_ispositive(mpd));`
`2377`	`2380`	`}`
`2378`	`2381`
`2379`	`2382`	`/**`
`@@ -2384,7 +2387,10 @@ PHP_DECIMAL_ARGINFO_END()`
`2384`	`2387`	`PHP_DECIMAL_METHOD(isNegative)`
`2385`	`2388`	`{`
`2386`	`2389`	`PHP_DECIMAL_PARAMS_PARSE_NONE();`
`2387`		`- RETURN_BOOL(mpd_isnegative(THIS_MPD()));`
	`2390`	`+`
	`2391`	`+ mpd_t *mpd = THIS_MPD();`
	`2392`	`+`
	`2393`	`+ RETURN_BOOL(!mpd_isnan(mpd) && mpd_isnegative(mpd));`
`2388`	`2394`	`}`
`2389`	`2395`
`2390`	`2396`	`/**`