MFB

diff --git a/main/main.c b/main/main.c
index 79304ffa1fb6a3e30ff09673c62a534f2946c89c..2b395710102da0ae0f6ada2b3e6826f56a29193e 100644 (file)
--- a/main/main.c
+++ b/main/main.c
@@ -1521,12 +1521,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);