diff options
| author | Andrei Zmievski <andrei@php.net> | 2006-07-24 18:18:33 +0000 |
|---|---|---|
| committer | Andrei Zmievski <andrei@php.net> | 2006-07-24 18:18:33 +0000 |
| commit | 8474838a9a573cf56880e8e2409a5bf2c6bf94f3 (patch) | |
| tree | dd7c8f1565bbf05f626d407635b695406dfd063c /ext/standard/array.c | |
| parent | d0f2f6cd0467baaae6ff33c019bc635f8dde3ef3 (diff) | |
| download | php-git-8474838a9a573cf56880e8e2409a5bf2c6bf94f3.tar.gz | |
+1 for keys
Diffstat (limited to 'ext/standard/array.c')
| -rw-r--r-- | ext/standard/array.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/standard/array.c b/ext/standard/array.c index 076e440a26..163db160ae 100644 --- a/ext/standard/array.c +++ b/ext/standard/array.c @@ -4551,7 +4551,7 @@ PHP_FUNCTION(array_combine) zend_hash_get_current_data_ex(Z_ARRVAL_P(values), (void **)&entry_values, &pos_values) == SUCCESS) { if (Z_TYPE_PP(entry_keys) == IS_STRING) { zval_add_ref(entry_values); - add_assoc_zval_ex(return_value, Z_STRVAL_PP(entry_keys), Z_STRLEN_PP(entry_keys), *entry_values); + add_assoc_zval_ex(return_value, Z_STRVAL_PP(entry_keys), Z_STRLEN_PP(entry_keys)+1, *entry_values); } else if (Z_TYPE_PP(entry_keys) == IS_LONG) { zval_add_ref(entry_values); add_index_zval(return_value, Z_LVAL_PP(entry_keys), *entry_values); |