diff options
| author | Reeze Xia <reeze@php.net> | 2015-10-30 19:49:04 +0800 |
|---|---|---|
| committer | Reeze Xia <reeze@php.net> | 2015-10-30 19:49:04 +0800 |
| commit | 68b431e37d680a6d071bfaf1129ef7a4caa228ea (patch) | |
| tree | 5a26e0714b3434cd958420f3ddb53971ce1e690c | |
| parent | 3c5a3e77d4d56b08747205faba22dfcc6b2b569b (diff) | |
| download | php-git-68b431e37d680a6d071bfaf1129ef7a4caa228ea.tar.gz | |
Use h parameter to avoid duplicate ht access of `array_combine()`
| -rw-r--r-- | ext/standard/array.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/ext/standard/array.c b/ext/standard/array.c index 88818fe78f..a02a33b5b9 100644 --- a/ext/standard/array.c +++ b/ext/standard/array.c @@ -5474,17 +5474,17 @@ PHP_FUNCTION(array_chunk) Creates an array by using the elements of the first parameter as keys and the elements of the second as the corresponding values */ PHP_FUNCTION(array_combine) { - zval *values, *keys; + HashTable *values, *keys; uint32_t pos_values = 0; zval *entry_keys, *entry_values; int num_keys, num_values; - if (zend_parse_parameters(ZEND_NUM_ARGS(), "aa", &keys, &values) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "hh", &keys, &values) == FAILURE) { return; } - num_keys = zend_hash_num_elements(Z_ARRVAL_P(keys)); - num_values = zend_hash_num_elements(Z_ARRVAL_P(values)); + num_keys = zend_hash_num_elements(keys); + num_values = zend_hash_num_elements(values); if (num_keys != num_values) { php_error_docref(NULL, E_WARNING, "Both parameters should have an equal number of elements"); @@ -5497,12 +5497,12 @@ PHP_FUNCTION(array_combine) return; } - ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(keys), entry_keys) { + ZEND_HASH_FOREACH_VAL(keys, entry_keys) { while (1) { - if (pos_values >= Z_ARRVAL_P(values)->nNumUsed) { + if (pos_values >= values->nNumUsed) { break; - } else if (Z_TYPE(Z_ARRVAL_P(values)->arData[pos_values].val) != IS_UNDEF) { - entry_values = &Z_ARRVAL_P(values)->arData[pos_values].val; + } else if (Z_TYPE(values->arData[pos_values].val) != IS_UNDEF) { + entry_values = &values->arData[pos_values].val; if (Z_TYPE_P(entry_keys) == IS_LONG) { entry_values = zend_hash_index_update(Z_ARRVAL_P(return_value), Z_LVAL_P(entry_keys), entry_values); |