bring back the division by zero warning

diff --git a/Zend/tests/bug69957.phpt b/Zend/tests/bug69957.phpt
index d8d3a6f1fcebe56b930509565d401239dc310206..d578f9c8d2764b350f127d398103e88680d86f96 100644 (file)
--- a/Zend/tests/bug69957.phpt
+++ b/Zend/tests/bug69957.phpt
@@ -61,16 +61,21 @@ try {
 
 ?>
 --EXPECTF--
+Warning: Division by zero in %sbug69957.php on line %d
 float(INF)
 
 Variable mod
 Type: DivisionByZeroError
 Message: Modulo by zero
+
+Warning: Division by zero in %sbug69957.php on line %d
 float(INF)
 
 Literal mod
 Type: DivisionByZeroError
 Message: Modulo by zero
+
+Warning: Division by zero in %sbug69957.php on line %d
 float(INF)
 
 Double mod

diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index 2d41f3fda6c209632e16df27dd1d3d1d127ba9d8..02c79fbafc2e1ffcbfca28787775cb9b374742fd 100644 (file)
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -5637,9 +5637,11 @@ static inline zend_bool zend_try_ct_eval_binary_op(zval *result, uint32_t opcode
        binary_op_type fn = get_binary_op(opcode);
 
        /* don't evaluate division by zero at compile-time */
-       if (opcode == ZEND_MOD && zval_get_long(op2) == 0) {
+       if ((opcode == ZEND_DIV || opcode == ZEND_MOD) &&
+           zval_get_long(op2) == 0) {
                return 0;
-       } else if ((opcode == ZEND_SL || opcode == ZEND_SR) && zval_get_long(op2) < 0) {
+       } else if ((opcode == ZEND_SL || opcode == ZEND_SR) &&
+           zval_get_long(op2) < 0) {
                return 0;
        }
 

diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c
index 353be83afc588585b6f0dbdac8383aa7cf000947..8226cec9fedc62171745acafd8b33a75655d77ee 100644 (file)
--- a/Zend/zend_operators.c
+++ b/Zend/zend_operators.c
@@ -1111,24 +1111,40 @@ ZEND_API int ZEND_FASTCALL div_function(zval *result, zval *op1, zval *op2) /* {
        while (1) {
                switch (TYPE_PAIR(Z_TYPE_P(op1), Z_TYPE_P(op2))) {
                        case TYPE_PAIR(IS_LONG, IS_LONG):
-                               /* prevent crashes (arithmetic exception) */
-                               if (UNEXPECTED(Z_LVAL_P(op2) == 0 || (Z_LVAL_P(op2) == -1 && Z_LVAL_P(op1) == ZEND_LONG_MIN) || Z_LVAL_P(op1) % Z_LVAL_P(op2) != 0)) {
-                                       ZVAL_DOUBLE(result, ((double) Z_LVAL_P(op1)) / Z_LVAL_P(op2));
+                               if (Z_LVAL_P(op2) == 0) {
+                                       zend_error(E_WARNING, "Division by zero");
+                                       ZVAL_DOUBLE(result, ((double) Z_LVAL_P(op1) / (double) Z_LVAL_P(op2)));
                                        return SUCCESS;
-                               } else {
+                               } else if (Z_LVAL_P(op2) == -1 && Z_LVAL_P(op1) == ZEND_LONG_MIN) {
+                                       /* Prevent overflow error/crash */
+                                       ZVAL_DOUBLE(result, (double) ZEND_LONG_MIN / -1);
+                                       return SUCCESS;
+                               }
+                               if (Z_LVAL_P(op1) % Z_LVAL_P(op2) == 0) { /* integer */
                                        ZVAL_LONG(result, Z_LVAL_P(op1) / Z_LVAL_P(op2));
+                               } else {
+                                       ZVAL_DOUBLE(result, ((double) Z_LVAL_P(op1)) / Z_LVAL_P(op2));
                                }
                                return SUCCESS;
 
                        case TYPE_PAIR(IS_DOUBLE, IS_LONG):
+                               if (Z_LVAL_P(op2) == 0) {
+                                       zend_error(E_WARNING, "Division by zero");
+                               }
                                ZVAL_DOUBLE(result, Z_DVAL_P(op1) / (double)Z_LVAL_P(op2));
                                return SUCCESS;
 
                        case TYPE_PAIR(IS_LONG, IS_DOUBLE):
+                               if (Z_DVAL_P(op2) == 0) {
+                                       zend_error(E_WARNING, "Division by zero");
+                               }
                                ZVAL_DOUBLE(result, (double)Z_LVAL_P(op1) / Z_DVAL_P(op2));
                                return SUCCESS;
 
                        case TYPE_PAIR(IS_DOUBLE, IS_DOUBLE):
+                               if (Z_DVAL_P(op2) == 0) {
+                                       zend_error(E_WARNING, "Division by zero");
+                               }
                                ZVAL_DOUBLE(result, Z_DVAL_P(op1) / Z_DVAL_P(op2));
                                return SUCCESS;
 

diff --git a/tests/run-test/test005.phpt b/tests/run-test/test005.phpt
index 1413a198a676b62a030da2f91d989d6bc0e8322b..5dcb650444f99bdf09560f5bc6dfff2733608c73 100644 (file)
--- a/tests/run-test/test005.phpt
+++ b/tests/run-test/test005.phpt
@@ -19,7 +19,8 @@ var_dump(ini_get('track_errors'));
 ini_set('display_errors', 0);
 var_dump(ini_get('display_errors'));
 var_dump($php_errormsg);
-ini_set("zend.assertions", -1);
+$zero = 0;
+$error = 1 / $zero;
 var_dump($php_errormsg);
 ?>
 --EXPECTF--
@@ -29,4 +30,4 @@ string(1) "0"
 string(1) "1"
 string(1) "0"
 NULL
-string(%d) "%senabled or disabled%s"
+string(%d) "%sivision by zer%s"

diff --git a/tests/run-test/test006.phpt b/tests/run-test/test006.phpt
index 0ab1092a72c1d4e324f2a13b65a210bf237ee704..4dca66a4f717b7da1d1cca4423fa43752f8e4462 100644 (file)
--- a/tests/run-test/test006.phpt
+++ b/tests/run-test/test006.phpt
@@ -3,7 +3,7 @@ Error messages are shown
 --FILE--
 <?php
 // If this test fails ask the developers of run-test.php
-ini_set("zend.assertions", -1);
+$error = 1 / 0;
 ?>
 --EXPECTREGEX--
-.*enabled or disabled.*
+.*Division by zero.*

diff --git a/tests/run-test/test008a.phpt b/tests/run-test/test008a.phpt
index 954f899aca9d86cd8dbf423baf274659c8d6ab5b..ff2a93be0fcf4764d662d29c0c94d48600e09e15 100644 (file)
--- a/tests/run-test/test008a.phpt
+++ b/tests/run-test/test008a.phpt
@@ -19,7 +19,8 @@ var_dump(ini_get('track_errors'));
 ini_set('display_errors', 0);
 var_dump(ini_get('display_errors'));
 var_dump($php_errormsg);
-ini_set('zend.assertions', -1);
+$zero = 0;
+$error = 1 / $zero;
 var_dump($php_errormsg);
 ?>
 --EXPECTF--
@@ -29,4 +30,4 @@ string(1) "0"
 string(1) "1"
 string(1) "0"
 NULL
-string(%d) "%senabled or disabled%s"
+string(%d) "%sivision by zer%s"