com php-src: Fix array_column() packed hash initial ization: ext/standard/array.c
| From: | Nikita Popov | Date: | Mon, 08 Aug 2016 16:47:52 +0000 |
| Subject: | com php-src: Fix array_column() packed hash initial ization: ext/standard/array.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-93673@lists.php.net to get a copy of this message | ||
Commit: cf017ce17f2577db987b44822cd6214378e53277
Author: Nikita Popov <nikic@php.net> Mon, 8 Aug 2016 18:46:54 +0200
Parents: 33a7ad2365d79a71429c81978190b488cbbc007d
Branches: PHP-7.1 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=cf017ce17f2577db987b44822cd6214378e53277
Log:
Fix array_column() packed hash initialization
FILL assumes enough space is alredy allocated -- do that. Note that
the used size is an upper bound, albeit a likely one.
Changed paths:
M ext/standard/array.c
Diff:
diff --git a/ext/standard/array.c b/ext/standard/array.c
index e67293b..cb78cad 100644
--- a/ext/standard/array.c
+++ b/ext/standard/array.c
@@ -3592,7 +3592,7 @@ PHP_FUNCTION(array_column)
RETURN_FALSE;
}
- array_init(return_value);
+ array_init_size(return_value, zend_hash_num_elements(arr_hash));
if (!zkey) {
zend_hash_real_init(Z_ARRVAL_P(return_value), 1);
ZEND_HASH_FILL_PACKED(Z_ARRVAL_P(return_value)) {