diff options
| -rw-r--r-- | ext/standard/array.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/ext/standard/array.c b/ext/standard/array.c index a12a95e170..3a85caeb63 100644 --- a/ext/standard/array.c +++ b/ext/standard/array.c @@ -2809,6 +2809,7 @@ PHP_FUNCTION(array_sum) **entry; int argc = ZEND_NUM_ARGS(); HashPosition pos; + double dval; if (argc != 1 || zend_get_parameters_ex(argc, &input) == FAILURE) { WRONG_PARAM_COUNT; @@ -2833,12 +2834,15 @@ PHP_FUNCTION(array_sum) convert_scalar_to_number(*entry TSRMLS_CC); if (Z_TYPE_PP(entry) == IS_LONG && Z_TYPE_P(return_value) == IS_LONG) { - Z_LVAL_P(return_value) += Z_LVAL_PP(entry); - } else { - convert_to_double(return_value); - convert_to_double_ex(entry); - Z_DVAL_P(return_value) += Z_DVAL_PP(entry); + dval = (double)Z_LVAL_P(return_value) + (double)Z_LVAL_PP(entry); + if ( (double)LONG_MIN <= dval && dval <= (double)LONG_MAX ) { + Z_LVAL_P(return_value) += Z_LVAL_PP(entry); + continue; + } } + convert_to_double(return_value); + convert_to_double_ex(entry); + Z_DVAL_P(return_value) += Z_DVAL_PP(entry); } } |