diff options
| author | Xinchen Hui <laruence@php.net> | 2013-07-21 21:07:27 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2013-07-21 21:07:27 +0800 |
| commit | c7b58e49670ffce80422fe062196ddef31cdfc0a (patch) | |
| tree | b545eb8f4f550a65ff825598f633a412de739016 | |
| parent | 3cd13204bb3655b11cdbe6a5c4a1d0ce17c0b950 (diff) | |
| parent | 3380de9774551964af976aa48328e7e6f9bd78ff (diff) | |
| download | php-git-c7b58e49670ffce80422fe062196ddef31cdfc0a.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
| -rw-r--r-- | ext/standard/array.c | 12 | ||||
| -rw-r--r-- | ext/standard/tests/array/bug65304.phpt | 10 |
2 files changed, 11 insertions, 11 deletions
diff --git a/ext/standard/array.c b/ext/standard/array.c index 4f5209e2f7..99dbb538ea 100644 --- a/ext/standard/array.c +++ b/ext/standard/array.c @@ -4071,17 +4071,7 @@ PHP_FUNCTION(array_sum) entry_n = **entry; zval_copy_ctor(&entry_n); convert_scalar_to_number(&entry_n TSRMLS_CC); - - 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(entry_n); - continue; - } - } - convert_to_double(return_value); - convert_to_double(&entry_n); - Z_DVAL_P(return_value) += Z_DVAL(entry_n); + fast_add_function(return_value, return_value, &entry_n TSRMLS_CC); } } /* }}} */ diff --git a/ext/standard/tests/array/bug65304.phpt b/ext/standard/tests/array/bug65304.phpt new file mode 100644 index 0000000000..e5c9dfc5e6 --- /dev/null +++ b/ext/standard/tests/array/bug65304.phpt @@ -0,0 +1,10 @@ +--TEST-- +Bug #65304 (Use of max int in array_sum) +--FILE-- +<?php +var_dump(array_sum(array(PHP_INT_MAX, 1))); +var_dump(PHP_INT_MAX + 1); +?> +--EXPECTF-- +float(%s) +float(%s) |