com php-src: reverted erroneous patch in array_sum(): ext/standard/array.c
| From: | Anatol Belski | Date: | Fri, 10 Jan 2014 13:56:03 +0000 |
| Subject: | com php-src: reverted erroneous patch in array_sum(): ext/standard/array.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-75564@lists.php.net to get a copy of this message | ||
Commit: 5fefc0ce47a9c26747ecfe095757c1bb7c78fc59
Author: Anatol Belski <ab@php.net> Fri, 10 Jan 2014 14:56:03 +0100
Parents: aaccf60fea3431bf9014eced8e2c4b31f89a42af
Branches: str_size_and_int64
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=5fefc0ce47a9c26747ecfe095757c1bb7c78fc59
Log:
reverted erroneous patch in array_sum()
Changed paths:
M ext/standard/array.c
Diff:
diff --git a/ext/standard/array.c b/ext/standard/array.c
index 9bafd6a..aea27d3 100644
--- a/ext/standard/array.c
+++ b/ext/standard/array.c
@@ -4072,8 +4072,7 @@ PHP_FUNCTION(array_sum)
{
zval *input,
**entry,
- entry_n,
- entry_m;
+ entry_n;
HashPosition pos;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a", &input) == FAILURE) {
@@ -4089,12 +4088,10 @@ PHP_FUNCTION(array_sum)
if (Z_TYPE_PP(entry) == IS_ARRAY || Z_TYPE_PP(entry) == IS_OBJECT) {
continue;
}
- Z_IVAL(entry_m) = Z_IVAL_P(return_value);
- Z_TYPE(entry_m) = Z_TYPE_P(return_value);
entry_n = **entry;
zval_copy_ctor(&entry_n);
convert_scalar_to_number(&entry_n TSRMLS_CC);
- fast_add_function(return_value, &entry_m, &entry_n TSRMLS_CC);
+ fast_add_function(return_value, return_value, &entry_n TSRMLS_CC);
}
}
/* }}} */