From b2c5ef42d34d4d071d73ebd53044c8f77f1ac931 Mon Sep 17 00:00:00 2001 From: Zeev Suraski Date: Fri, 23 Apr 1999 13:25:33 +0000 Subject: [PATCH] Arithmetics bug fix --- Zend/zend_operators.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c index 242afc85b6..fedddb5f65 100644 --- a/Zend/zend_operators.c +++ b/Zend/zend_operators.c @@ -437,10 +437,10 @@ ZEND_API int add_function(zval *result, zval *op1, zval *op2) } if ((op1->type == IS_DOUBLE && op2->type == IS_LONG) || (op1->type == IS_LONG && op2->type == IS_DOUBLE)) { - result->type = IS_DOUBLE; result->value.dval = (op1->type == IS_LONG ? (((double) op1->value.lval) + op2->value.dval) : (op1->value.dval + ((double) op2->value.lval))); + result->type = IS_DOUBLE; return SUCCESS; } if (op1->type == IS_DOUBLE && op2->type == IS_DOUBLE) { @@ -474,10 +474,10 @@ ZEND_API int sub_function(zval *result, zval *op1, zval *op2) } if ((op1->type == IS_DOUBLE && op2->type == IS_LONG) || (op1->type == IS_LONG && op2->type == IS_DOUBLE)) { - result->type = IS_DOUBLE; result->value.dval = (op1->type == IS_LONG ? (((double) op1->value.lval) - op2->value.dval) : (op1->value.dval - ((double) op2->value.lval))); + result->type = IS_DOUBLE; return SUCCESS; } if (op1->type == IS_DOUBLE && op2->type == IS_DOUBLE) { @@ -511,10 +511,10 @@ ZEND_API int mul_function(zval *result, zval *op1, zval *op2) } if ((op1->type == IS_DOUBLE && op2->type == IS_LONG) || (op1->type == IS_LONG && op2->type == IS_DOUBLE)) { - result->type = IS_DOUBLE; result->value.dval = (op1->type == IS_LONG ? (((double) op1->value.lval) * op2->value.dval) : (op1->value.dval * ((double) op2->value.lval))); + result->type = IS_DOUBLE; return SUCCESS; } if (op1->type == IS_DOUBLE && op2->type == IS_DOUBLE) { @@ -550,10 +550,10 @@ ZEND_API int div_function(zval *result, zval *op1, zval *op2) } if ((op1->type == IS_DOUBLE && op2->type == IS_LONG) || (op1->type == IS_LONG && op2->type == IS_DOUBLE)) { - result->type = IS_DOUBLE; result->value.dval = (op1->type == IS_LONG ? (((double) op1->value.lval) / op2->value.dval) : (op1->value.dval / ((double) op2->value.lval))); + result->type = IS_DOUBLE; return SUCCESS; } if (op1->type == IS_DOUBLE && op2->type == IS_DOUBLE) { @@ -895,8 +895,8 @@ ZEND_API int compare_function(zval *result, zval *op1, zval *op2) } if ((op1->type == IS_DOUBLE || op1->type == IS_LONG) && (op2->type == IS_DOUBLE || op2->type == IS_LONG)) { - result->type = IS_DOUBLE; result->value.dval = (op1->type == IS_LONG ? (double) op1->value.lval : op1->value.dval) - (op2->type == IS_LONG ? (double) op2->value.lval : op2->value.dval); + result->type = IS_DOUBLE; return SUCCESS; } if ((op1->type==IS_ARRAY || op1->type==IS_OBJECT) -- 2.50.1