clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 10:27:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

@- Fixed array_merge_recursive() to avoid problems with merging cyclical

Browse Source 
@  arrays (bug #16064). (Andrei)
This commit is contained in:
Andrei Zmievski 2002-09-10 18:34:16 +00:00
parent 1f6770ddae
commit dd7cf22443
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ext/standard/array.c
View File

@ -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)

2
ext/standard/php_array.h
View File

@ -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 {