From 8474838a9a573cf56880e8e2409a5bf2c6bf94f3 Mon Sep 17 00:00:00 2001 From: Andrei Zmievski Date: Mon, 24 Jul 2006 18:18:33 +0000 Subject: +1 for keys --- ext/standard/array.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ext/standard/array.c') 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); -- cgit v1.2.1