]> granicus.if.org Git - php/commitdiff
+1 for keys
authorAndrei Zmievski <andrei@php.net>
Mon, 24 Jul 2006 18:18:33 +0000 (18:18 +0000)
committerAndrei Zmievski <andrei@php.net>
Mon, 24 Jul 2006 18:18:33 +0000 (18:18 +0000)
ext/standard/array.c

index 076e440a26854eefc1cd3bcdd5b28893bc1f8926..163db160ae5c2a297599390112efc4a097bc39e1 100644 (file)
@@ -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);