mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-12-25 17:59:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed segfault in ext/standard/tests/strings/bug49785.phpt

Browse Source
This commit is contained in:
Xinchen Hui 2014-02-23 21:53:48 +08:00
parent 70baf8f419
commit 69a93d2fd7
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ext/standard/array.c
View File

@ -2255,20 +2255,26 @@ PHPAPI int php_array_merge(HashTable *dest, HashTable *src, int recursive TSRMLS
thash->nApplyCount--;
}
} else {
Z_ADDREF_P(src_entry);
if (Z_REFCOUNTED_P(src_entry)) {
Z_ADDREF_P(src_entry);
}
zend_hash_next_index_insert(Z_ARRVAL_P(dest_entry), &src_zval);
}
if (tmp) {
zval_ptr_dtor(tmp);
}
} else {
Z_ADDREF_P(src_entry);
if (Z_REFCOUNTED_P(src_entry)) {
Z_ADDREF_P(src_entry);
}
zend_hash_update(dest, string_key, src_entry);
}
break;
case HASH_KEY_IS_LONG:
Z_ADDREF_P(src_entry);
if (Z_REFCOUNTED_P(src_entry)) {
Z_ADDREF_P(src_entry);
}
zend_hash_next_index_insert(dest, src_entry);
break;
}
@ -4324,11 +4330,11 @@ PHP_FUNCTION(array_map)
zend_hash_internal_pointer_reset_ex(Z_ARRVAL(arrays[i]), &array_pos[i]);
}
efree(arrays);
/* Short-circuit: if no callback and only one array, just return it. */
if (!ZEND_FCI_INITIALIZED(fci) && n_arrays == 1) {
RETVAL_ZVAL(args[0], 1, 0);
efree(arrays);
efree(array_len);
efree(array_pos);
efree(args);
@ -4403,6 +4409,7 @@ PHP_FUNCTION(array_map)
}
}
efree(arrays);
efree(params);
efree(array_len);
efree(array_pos);