Merge branch 'PHP-7.1'

php · Aug 8, 2016 · cc13a56 · cc13a56
2 parents e20e9c6 + cf017ce
commit cc13a56
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/ext/standard/array.c b/ext/standard/array.c
@@ -3593,7 +3593,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)) {