diff options
| author | Andrei Zmievski <andrei@php.net> | 2002-09-10 18:34:16 +0000 |
|---|---|---|
| committer | Andrei Zmievski <andrei@php.net> | 2002-09-10 18:34:16 +0000 |
| commit | dd7cf2244311603e76f89d1c766767664c8527fc (patch) | |
| tree | 125b193268e4318a17fa5e75e9e1bf26fc0da91e | |
| parent | 1f6770ddae99892a17e22783de9dcc2bfc5a7c2e (diff) | |
| download | php-git-dd7cf2244311603e76f89d1c766767664c8527fc.tar.gz | |
@- Fixed array_merge_recursive() to avoid problems with merging cyclical
@ arrays (bug #16064). (Andrei)
| -rw-r--r-- | ext/standard/array.c | 14 | ||||
| -rw-r--r-- | ext/standard/php_array.h | 2 |
2 files changed, 12 insertions, 4 deletions
diff --git a/ext/standard/array.c b/ext/standard/array.c index 2af0847e11..b132b5d6bd 100644 --- a/ext/standard/array.c +++ b/ext/standard/array.c @@ -1966,7 +1966,7 @@ PHP_FUNCTION(array_slice) /* }}} */ -PHPAPI void php_array_merge(HashTable *dest, HashTable *src, int recursive) +PHPAPI int php_array_merge(HashTable *dest, HashTable *src, int recursive) { zval **src_entry, **dest_entry; @@ -1982,10 +1982,16 @@ PHPAPI void php_array_merge(HashTable *dest, HashTable *src, int recursive) if (recursive && zend_hash_find(dest, string_key, string_key_len, (void **)&dest_entry) == SUCCESS) { + if (*src_entry == *dest_entry) { + zend_error(E_WARNING, "%s(): recursion detected", + get_active_function_name()); + return 0; + } convert_to_array_ex(dest_entry); convert_to_array_ex(src_entry); - php_array_merge(Z_ARRVAL_PP(dest_entry), - Z_ARRVAL_PP(src_entry), recursive); + if (!php_array_merge(Z_ARRVAL_PP(dest_entry), + Z_ARRVAL_PP(src_entry), recursive)) + return 0; } else { (*src_entry)->refcount++; @@ -2002,6 +2008,8 @@ PHPAPI void php_array_merge(HashTable *dest, HashTable *src, int recursive) zend_hash_move_forward_ex(src, &pos); } + + return 1; } static void php_array_merge_wrapper(INTERNAL_FUNCTION_PARAMETERS, int recursive) diff --git a/ext/standard/php_array.h b/ext/standard/php_array.h index 96c05a7a37..0ef979c550 100644 --- a/ext/standard/php_array.h +++ b/ext/standard/php_array.h @@ -83,7 +83,7 @@ PHP_FUNCTION(array_key_exists); PHP_FUNCTION(array_chunk); HashTable* php_splice(HashTable *, int, int, zval ***, int, HashTable **); -PHPAPI void php_array_merge(HashTable *dest, HashTable *src, int recursive); +PHPAPI int php_array_merge(HashTable *dest, HashTable *src, int recursive); int multisort_compare(const void *a, const void *b TSRMLS_DC); typedef struct { |