diff options
| author | Zeev Suraski <zeev@php.net> | 2001-06-26 21:11:35 +0000 |
|---|---|---|
| committer | Zeev Suraski <zeev@php.net> | 2001-06-26 21:11:35 +0000 |
| commit | 5e999930589ca2c45a979d45b093d5a79e6c7ea6 (patch) | |
| tree | d8d30a4a21f924f31e988a8032e94f257798f37a /Zend/zend_operators.c | |
| parent | eaaf36b65e9090b4e8bf8d2e9ae5bcc87fff7aff (diff) | |
| download | php-git-5e999930589ca2c45a979d45b093d5a79e6c7ea6.tar.gz | |
Fixed autoconversion of negative values to double (Fix bug #11685)
Diffstat (limited to 'Zend/zend_operators.c')
| -rw-r--r-- | Zend/zend_operators.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c index 11d72f6dc4..7cf3409e42 100644 --- a/Zend/zend_operators.c +++ b/Zend/zend_operators.c @@ -611,7 +611,7 @@ ZEND_API int add_function(zval *result, zval *op1, zval *op2) if (op1->type == IS_LONG && op2->type == IS_LONG) { double dval = (double) op1->value.lval + (double) op2->value.lval; - if (dval > (double) LONG_MAX) { + if ((dval > (double) LONG_MAX) || (dval < (double) LONG_MIN)) { result->value.dval = dval; result->type = IS_DOUBLE; } else { @@ -648,7 +648,7 @@ ZEND_API int sub_function(zval *result, zval *op1, zval *op2) if (op1->type == IS_LONG && op2->type == IS_LONG) { double dval = (double) op1->value.lval - (double) op2->value.lval; - if (dval < (double) LONG_MIN) { + if ((dval < (double) LONG_MIN) || (dval > (double) LONG_MAX)) { result->value.dval = dval; result->type = IS_DOUBLE; } else { @@ -685,7 +685,7 @@ ZEND_API int mul_function(zval *result, zval *op1, zval *op2) if (op1->type == IS_LONG && op2->type == IS_LONG) { double dval = (double) op1->value.lval * (double) op2->value.lval; - if (dval > (double) LONG_MAX) { + if ((dval > (double) LONG_MAX) || (dval < (double) LONG_MIN)) { result->value.dval = dval; result->type = IS_DOUBLE; } else { |