Elide UB

Author: Girgias

ext/standard/array.c

@@ -1249,7 +1249,7 @@ PHP_FUNCTION(min)
 						min_lval = Z_LVAL(args[i]);
 						min = &args[i];
 					}
-				} else if (Z_TYPE(args[i]) == IS_DOUBLE && ((zend_long)(double) min_lval == min_lval)) {
+				} else if (Z_TYPE(args[i]) == IS_DOUBLE && (zend_dval_to_lval((double) min_lval) == min_lval)) {
 					min_dval = (double) min_lval;
 					goto double_compare;
 				} else {
@@ -1268,7 +1268,7 @@ PHP_FUNCTION(min)
 						min_dval = Z_DVAL(args[i]);
 						min = &args[i];
 					}
-				} else if (Z_TYPE(args[i]) == IS_LONG && ((zend_long)(double) Z_LVAL(args[i]) == Z_LVAL(args[i]))) {
+				} else if (Z_TYPE(args[i]) == IS_LONG && (zend_dval_to_lval((double) Z_LVAL(args[i])) == Z_LVAL(args[i]))) {
 					if (min_dval > (double)Z_LVAL(args[i])) {
 						min_dval = (double)Z_LVAL(args[i]);
 						min = &args[i];
@@ -1336,7 +1336,7 @@ PHP_FUNCTION(max)
 						max_lval = Z_LVAL(args[i]);
 						max = &args[i];
 					}
-				} else if (Z_TYPE(args[i]) == IS_DOUBLE && ((zend_long)(double) max_lval == max_lval)) {
+				} else if (Z_TYPE(args[i]) == IS_DOUBLE && (zend_dval_to_lval((double) max_lval) == max_lval)) {
 					max_dval = (double) max_lval;
 					goto double_compare;
 				} else {
@@ -1355,7 +1355,7 @@ PHP_FUNCTION(max)
 						max_dval = Z_DVAL(args[i]);
 						max = &args[i];
 					}
-				} else if (Z_TYPE(args[i]) == IS_LONG && ((zend_long)(double) Z_LVAL(args[i]) == Z_LVAL(args[i]))) {
+				} else if (Z_TYPE(args[i]) == IS_LONG && (zend_dval_to_lval((double) Z_LVAL(args[i])) == Z_LVAL(args[i]))) {
 					if (max_dval < (double)Z_LVAL(args[i])) {
 						max_dval = (double)Z_LVAL(args[i]);
 						max = &args[i];

ext/standard/tests/array/max_int_float_optimisation.phpt

@@ -31,6 +31,13 @@ echo "Check that int not representable as float works:\n";
 var_dump(max(
     PHP_INT_MIN+1, PHP_INT_MIN, PHP_INT_MIN*2)
 );
+var_dump(max(
+    PHP_INT_MAX-1, PHP_INT_MAX, PHP_INT_MAX*2)
+);
+// Has INF
+var_dump(max(
+    PHP_INT_MAX-1, PHP_INT_MAX, PHP_INT_MAX**20)
+);
 
 echo "Start as float optimisation:\n";
 var_dump(max(
@@ -58,6 +65,13 @@ echo "Check that int not representable as float works:\n";
 var_dump(max(
     PHP_INT_MIN*2, PHP_INT_MIN, PHP_INT_MIN+1)
 );
+var_dump(max(
+    PHP_INT_MAX*2, PHP_INT_MAX, PHP_INT_MAX-1)
+);
+// Has INF
+var_dump(max(
+    PHP_INT_MAX**20, PHP_INT_MAX, PHP_INT_MAX-1)
+);
 
 ?>
 --EXPECT--
@@ -71,6 +85,8 @@ int(10)
 string(2) "15"
 Check that int not representable as float works:
 int(-9223372036854775807)
+float(1.8446744073709552E+19)
+float(INF)
 Start as float optimisation:
 float(10.5)
 float(10.5)
@@ -81,3 +97,5 @@ float(10.5)
 string(4) "15.5"
 Check that int not representable as float works:
 int(-9223372036854775807)
+float(1.8446744073709552E+19)
+float(INF)

ext/standard/tests/array/min_int_float_optimisation.phpt

@@ -31,6 +31,13 @@ echo "Check that int not representable as float works:\n";
 var_dump(min(
     PHP_INT_MAX-1, PHP_INT_MAX, PHP_INT_MAX*2)
 );
+var_dump(min(
+    PHP_INT_MIN+1, PHP_INT_MIN, PHP_INT_MIN*2)
+);
+// Has INF
+var_dump(min(
+    PHP_INT_MAX-1, PHP_INT_MAX, PHP_INT_MAX**20)
+);
 
 echo "Start as float optimisation:\n";
 var_dump(min(
@@ -58,6 +65,13 @@ echo "Check that int not representable as float works:\n";
 var_dump(min(
     PHP_INT_MAX*2, PHP_INT_MAX, PHP_INT_MAX-1)
 );
+var_dump(min(
+    PHP_INT_MIN*2, PHP_INT_MIN, PHP_INT_MIN+1)
+);
+// Has INF
+var_dump(min(
+    PHP_INT_MAX**20, PHP_INT_MAX, PHP_INT_MAX-1)
+);
 
 ?>
 --EXPECT--
@@ -71,6 +85,8 @@ int(2)
 string(1) "1"
 Check that int not representable as float works:
 int(9223372036854775806)
+float(-1.8446744073709552E+19)
+int(9223372036854775806)
 Start as float optimisation:
 float(2.5)
 float(2.5)
@@ -81,3 +97,5 @@ float(2.5)
 string(3) "1.5"
 Check that int not representable as float works:
 int(9223372036854775806)
+float(-1.8446744073709552E+19)
+int(9223372036854775806)