Improve NAN handling

Author: kylekatarnls

ext/standard/math.c

@@ -400,6 +400,16 @@ PHP_FUNCTION(clamp)
 		Z_PARAM_ZVAL(zmax)
 	ZEND_PARSE_PARAMETERS_END();
 
+	if (EXPECTED(Z_TYPE_P(zmin) == IS_DOUBLE) && UNEXPECTED(zend_isnan(Z_DVAL_P(zmin)))) {
+		zend_argument_value_error(2, "cannot be NAN");
+		RETURN_THROWS();
+	}
+
+	if (EXPECTED(Z_TYPE_P(zmax) == IS_DOUBLE) && UNEXPECTED(zend_isnan(Z_DVAL_P(zmax)))) {
+		zend_argument_value_error(3, "cannot be NAN");
+		RETURN_THROWS();
+	}
+
 	if (zend_compare(zmin, zmax) > 0) {
 		zend_argument_value_error(2, "must be smaller than or equal to argument #3 ($max)");
 		RETURN_THROWS();
@@ -425,6 +435,16 @@ ZEND_FRAMELESS_FUNCTION(clamp, 3)
 	Z_FLF_PARAM_ZVAL(2, zmin);
 	Z_FLF_PARAM_ZVAL(3, zmax);
 
+	if (EXPECTED(Z_TYPE_P(zmin) == IS_DOUBLE) && UNEXPECTED(zend_isnan(Z_DVAL_P(zmin)))) {
+		zend_argument_value_error(2, "cannot be NAN");
+		RETURN_THROWS();
+	}
+
+	if (EXPECTED(Z_TYPE_P(zmax) == IS_DOUBLE) && UNEXPECTED(zend_isnan(Z_DVAL_P(zmax)))) {
+		zend_argument_value_error(3, "cannot be NAN");
+		RETURN_THROWS();
+	}
+
 	if (zend_compare(zmin, zmax) > 0) {
 		zend_argument_value_error(2, "must be smaller than or equal to argument #3 ($max)");
 		RETURN_THROWS();

ext/standard/tests/math/clamp.phpt

@@ -15,17 +15,30 @@ var_dump(clamp(2.5, 1.3, 3.4));
 var_dump(clamp(0, 1.3, 3.4));
 var_dump(clamp(M_PI, -INF, INF));
 var_dump(clamp(NAN, 4, 6));
-var_dump(clamp(4, NAN, 6));
-var_dump(clamp(8, NAN, 6));
-var_dump(clamp(7, 6, NAN));
-var_dump(clamp(4, 6, NAN));
 var_dump(clamp("a", "c", "g"));
 var_dump(clamp("d", "c", "g"));
 echo clamp('2025-08-01', '2025-08-15', '2025-09-15'), "\n";
 echo clamp('2025-08-20', '2025-08-15', '2025-09-15'), "\n";
 echo clamp(new \DateTimeImmutable('2025-08-01'), new \DateTimeImmutable('2025-08-15'), new \DateTimeImmutable('2025-09-15'))->format('Y-m-d'), "\n";
 echo clamp(new \DateTimeImmutable('2025-08-20'), new \DateTimeImmutable('2025-08-15'), new \DateTimeImmutable('2025-09-15'))->format('Y-m-d'), "\n";
 
+try {
+    var_dump(clamp(4, NAN, 6));
+} catch (ValueError $error) {
+    echo $error->getMessage(), "\n";
+}
+
+try {
+    var_dump(clamp(7, 6, NAN));
+} catch (ValueError $error) {
+    echo $error->getMessage(), "\n";
+}
+
+try {
+    var_dump(clamp(1, 3, 2));
+} catch (ValueError $error) {
+    echo $error->getMessage(), "\n";
+}
 ?>
 --EXPECT--
 int(2)
@@ -37,13 +50,12 @@ float(2.5)
 float(1.3)
 float(3.141592653589793)
 double(NAN)
-int(4)
-int(6)
-int(7)
-int(6)
 string(1) "c"
 string(1) "d"
 2025-08-15
 2025-08-20
 2025-08-15
 2025-08-20
+Argument #2 ($min) cannot be NAN
+Argument #3 ($max) cannot be NAN
+Argument #2 ($min) must be smaller than or equal to argument #3 ($max)