mirror of
https://github.com/php/php-src.git
synced 2025-08-16 05:58:45 +02:00
Remove warning upon division by zero
This commit is contained in:
parent
fa1abb5677
commit
f9724b93f6
5 changed files with 11 additions and 34 deletions
|
@ -61,21 +61,16 @@ try {
|
|||
|
||||
?>
|
||||
--EXPECTF--
|
||||
Warning: Division by zero in %sbug69957.php on line %d
|
||||
float(INF)
|
||||
|
||||
Variable mod
|
||||
Type: Exception
|
||||
Message: Division by zero
|
||||
|
||||
Warning: Division by zero in %sbug69957.php on line %d
|
||||
float(INF)
|
||||
|
||||
Literal mod
|
||||
Type: Exception
|
||||
Message: Division by zero
|
||||
|
||||
Warning: Division by zero in %sbug69957.php on line %d
|
||||
float(INF)
|
||||
|
||||
Double mod
|
||||
|
|
|
@ -1103,40 +1103,24 @@ 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):
|
||||
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 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 {
|
||||
/* 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));
|
||||
return SUCCESS;
|
||||
} else {
|
||||
ZVAL_LONG(result, 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;
|
||||
|
||||
|
|
|
@ -19,8 +19,7 @@ var_dump(ini_get('track_errors'));
|
|||
ini_set('display_errors', 0);
|
||||
var_dump(ini_get('display_errors'));
|
||||
var_dump($php_errormsg);
|
||||
$zero = 0;
|
||||
$error = 1 / $zero;
|
||||
ini_set("zend.assertions", -1);
|
||||
var_dump($php_errormsg);
|
||||
?>
|
||||
--EXPECTF--
|
||||
|
@ -30,4 +29,4 @@ string(1) "0"
|
|||
string(1) "1"
|
||||
string(1) "0"
|
||||
NULL
|
||||
string(%d) "%sivision by zer%s"
|
||||
string(%d) "%senabled or disabled%s"
|
||||
|
|
|
@ -3,7 +3,7 @@ Error messages are shown
|
|||
--FILE--
|
||||
<?php
|
||||
// If this test fails ask the developers of run-test.php
|
||||
$error = 1 / 0;
|
||||
ini_set("zend.assertions", -1);
|
||||
?>
|
||||
--EXPECTREGEX--
|
||||
.*Division by zero.*
|
||||
.*enabled or disabled.*
|
||||
|
|
|
@ -19,8 +19,7 @@ var_dump(ini_get('track_errors'));
|
|||
ini_set('display_errors', 0);
|
||||
var_dump(ini_get('display_errors'));
|
||||
var_dump($php_errormsg);
|
||||
$zero = 0;
|
||||
$error = 1 / $zero;
|
||||
ini_set('zend.assertions', -1);
|
||||
var_dump($php_errormsg);
|
||||
?>
|
||||
--EXPECTF--
|
||||
|
@ -30,4 +29,4 @@ string(1) "0"
|
|||
string(1) "1"
|
||||
string(1) "0"
|
||||
NULL
|
||||
string(%d) "%sivision by zer%s"
|
||||
string(%d) "%senabled or disabled%s"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue