diff options
| author | Ilia Alshanetsky <iliaa@php.net> | 2003-05-21 22:54:38 +0000 |
|---|---|---|
| committer | Ilia Alshanetsky <iliaa@php.net> | 2003-05-21 22:54:38 +0000 |
| commit | cb87994fcd52a36453cb2a098fc5e61445b4653d (patch) | |
| tree | 462249dc14ef840401e2309ee300d882f282f9dd | |
| parent | 961b1151c0d00e107b2f6af8d896dd1ccf423fcc (diff) | |
| download | php-git-cb87994fcd52a36453cb2a098fc5e61445b4653d.tar.gz | |
Fixed bug #23744
| -rw-r--r-- | main/main.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/main/main.c b/main/main.c index d855b80391..9aa567b07c 100644 --- a/main/main.c +++ b/main/main.c @@ -1326,12 +1326,15 @@ static void php_autoglobal_merge(HashTable *dest, HashTable *src TSRMLS_DC) zend_hash_internal_pointer_reset_ex(src, &pos); while (zend_hash_get_current_data_ex(src, (void **)&src_entry, &pos) == SUCCESS) { key_type = zend_hash_get_current_key_ex(src, &string_key, &string_key_len, &num_key, 0, &pos); - if (Z_TYPE_PP(src_entry) != IS_ARRAY || (zend_hash_find(dest, string_key, string_key_len, (void **)&dest_entry) != SUCCESS) || Z_TYPE_PP(dest_entry) != IS_ARRAY) { + if (Z_TYPE_PP(src_entry) != IS_ARRAY || + (string_key_len && zend_hash_find(dest, string_key, string_key_len, (void **)&dest_entry) != SUCCESS) || + (!string_key_len && zend_hash_index_find(dest, num_key, (void **)&dest_entry) != SUCCESS) + || Z_TYPE_PP(dest_entry) != IS_ARRAY) { (*src_entry)->refcount++; if (key_type == HASH_KEY_IS_STRING) { zend_hash_update(dest, string_key, strlen(string_key)+1, src_entry, sizeof(zval *), NULL); } else { - zend_hash_next_index_insert(dest, src_entry, sizeof(zval *), NULL); + zend_hash_index_update(dest, num_key, src_entry, sizeof(zval *), NULL); } } else { SEPARATE_ZVAL(dest_entry); |