mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-01-27 14:13:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix Bug #14795.

Browse Source
This commit is contained in:
Andrei Zmievski 2002-04-24 15:23:43 +00:00
parent 4fc01022e6
commit 5ff970ba7d
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ext/standard/array.c
View File

@ -2924,7 +2924,8 @@ PHP_FUNCTION(array_rand)
PHP_FUNCTION(array_sum)
{
zval **input,
**entry;
**entry,
entry_n;
int argc = ZEND_NUM_ARGS();
HashPosition pos;
double dval;
@ -2948,19 +2949,20 @@ PHP_FUNCTION(array_sum)
if (Z_TYPE_PP(entry) == IS_ARRAY || Z_TYPE_PP(entry) == IS_OBJECT)
continue;
SEPARATE_ZVAL(entry);
convert_scalar_to_number(*entry TSRMLS_CC);
entry_n = **entry;
zval_copy_ctor(&entry_n);
convert_scalar_to_number(&entry_n TSRMLS_CC);
if (Z_TYPE_PP(entry) == IS_LONG && Z_TYPE_P(return_value) == IS_LONG) {
dval = (double)Z_LVAL_P(return_value) + (double)Z_LVAL_PP(entry);
if (Z_TYPE(entry_n) == IS_LONG && Z_TYPE_P(return_value) == IS_LONG) {
dval = (double)Z_LVAL_P(return_value) + (double)Z_LVAL(entry_n);
if ( (double)LONG_MIN <= dval && dval <= (double)LONG_MAX ) {
Z_LVAL_P(return_value) += Z_LVAL_PP(entry);
Z_LVAL_P(return_value) += Z_LVAL(entry_n);
continue;
}
}
convert_to_double(return_value);
convert_to_double_ex(entry);
Z_DVAL_P(return_value) += Z_DVAL_PP(entry);
convert_to_double(&entry_n);
Z_DVAL_P(return_value) += Z_DVAL(entry_n);
}
}