Integer semantics

Zend/tests/int_special_values.phpt

@@ -0,0 +1,37 @@
+--TEST--
+Conversion of special float values to int
+--FILE--
+<?php
+$values = [
+    0.0,
+    INF,
+    -INF,
+    1 / INF,
+    -1 / INF, // Negative zero,
+    NAN
+];
+
+foreach($values as $value) {
+    var_dump($value);
+    var_dump((int)$value);
+    echo PHP_EOL;
+}
+?>
+--EXPECT--
+float(0)
+int(0)
+
+float(INF)
+int(0)
+
+float(-INF)
+int(0)
+
+float(0)
+int(0)
+
+float(-0)
+int(0)
+
+float(NAN)
+int(0)

Zend/zend_operators.c

@@ -1449,6 +1449,18 @@ ZEND_API int shift_left_function(zval *result, zval *op1, zval *op2 TSRMLS_DC) /
 		op1_lval = Z_LVAL_P(op1);
 	}
 
+	/* prevent wrapping quirkiness on some processors where << 64 + x == << x */
+	if (Z_LVAL_P(op2) >= SIZEOF_ZEND_LONG * 8) {
+		ZVAL_LONG(result, 0);
+		return SUCCESS;
+	}
+
+	if (Z_LVAL_P(op2) < 0) {
+		zend_error(E_WARNING, "Bit shift by negative number");
+		ZVAL_FALSE(result);
+		return FAILURE;
+	}
+
 	ZVAL_LONG(result, op1_lval << Z_LVAL_P(op2));
 	return SUCCESS;
 }
@@ -1469,6 +1481,18 @@ ZEND_API int shift_right_function(zval *result, zval *op1, zval *op2 TSRMLS_DC)
 		op1_lval = Z_LVAL_P(op1);
 	}
 
+	/* prevent wrapping quirkiness on some processors where >> 64 + x == >> x */
+	if (Z_LVAL_P(op2) >= SIZEOF_ZEND_LONG * 8) {
+		ZVAL_LONG(result, (Z_LVAL_P(op1) < 0) ? -1 : 0);
+		return SUCCESS;
+	}
+
+	if (Z_LVAL_P(op2) < 0) {
+		zend_error(E_WARNING, "Bit shift by negative number");
+		ZVAL_FALSE(result);
+		return FAILURE;
+	}
+
 	ZVAL_LONG(result, op1_lval >> Z_LVAL_P(op2));
 	return SUCCESS;
 }

Zend/zend_operators.h

@@ -72,11 +72,20 @@ ZEND_API zend_bool instanceof_function(const zend_class_entry *instance_ce, cons
 END_EXTERN_C()
 
 #if ZEND_DVAL_TO_LVAL_CAST_OK
-# define zend_dval_to_lval(d) ((zend_long) (d))
+static zend_always_inline zend_long zend_dval_to_lval(double d)
+{
+    if (EXPECTED(zend_finite(d)) && EXPECTED(!zend_isnan(d))) {
+        return (zend_long)d;
+    } else {
+        return 0;
+    }
+}
 #elif SIZEOF_ZEND_LONG == 4
 static zend_always_inline zend_long zend_dval_to_lval(double d)
 {
-	if (d > ZEND_LONG_MAX || d < ZEND_LONG_MIN) {
+	if (UNEXPECTED(!zend_finite(d)) || UNEXPECTED(zend_isnan(d))) {
+		return 0;
+	} else if (d > ZEND_LONG_MAX || d < ZEND_LONG_MIN) {
 		double	two_pow_32 = pow(2., 32.),
 				dmod;
 
@@ -93,8 +102,10 @@ static zend_always_inline zend_long zend_dval_to_lval(double d)
 #else
 static zend_always_inline zend_long zend_dval_to_lval(double d)
 {
+	if (UNEXPECTED(!zend_finite(d)) || UNEXPECTED(zend_isnan(d))) {
+		return 0;
 	/* >= as (double)ZEND_LONG_MAX is outside signed range */
-	if (d >= ZEND_LONG_MAX || d < ZEND_LONG_MIN) {
+	} else if (d >= ZEND_LONG_MAX || d < ZEND_LONG_MIN) {
 		double	two_pow_64 = pow(2., 64.),
 				dmod;