Skip to content

Destructor of regular arrays must be ZVAL_PTR_DTOR or NULL #24727

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
arnaud-lb wants to merge 3 commits into
base: master
Choose a base branch
from
+13 −3
Open

Destructor of regular arrays must be ZVAL_PTR_DTOR or NULL #24727

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6948c83
Destructor of regular arrays must be ZVAL_PTR_DTOR or NULL
arnaud-lb Oct 26, 2026
64cff0b
Avoid using zend_array_destroy for a non-array HashTable
arnaud-lb Oct 26, 2026
d9e7129
Use zend_new_array() for HashTable exposed to userspace
arnaud-lb Oct 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions Zend/zend_hash.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2051,6 +2051,9 @@ ZEND_API void ZEND_FASTCALL zend_array_destroy(HashTable *ht)
if (ht->nNumUsed) {
/* In some rare cases destructors of regular arrays may be changed */
if (UNEXPECTED(ht->pDestructor != ZVAL_PTR_DTOR)) {
if (UNEXPECTED(ht->pDestructor != NULL)) {
abort();
}
zend_hash_destroy(ht);
goto free_ht;
}
Expand Down
10 changes: 9 additions & 1 deletion ext/dom/private_data.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,22 @@ php_dom_libxml_ns_mapper *php_dom_ns_mapper_from_private(php_dom_private_data *p
return private_data == NULL ? NULL : &private_data->ns_mapper;
}

static void php_dom_libxml_ns_mapper_prefix_map_dtor(zval *zv)
{
HashTable *ht = Z_ARRVAL_P(zv);

zend_hash_destroy(ht);
efree(ht);
}

php_dom_private_data *php_dom_private_data_create(void)
{
php_dom_private_data *private_data = emalloc(sizeof(*private_data));
private_data->header.dtor = php_dom_libxml_private_data_destroy;
private_data->header.ns_hook = php_dom_libxml_private_data_ns_hook;
private_data->ns_mapper.html_ns = NULL;
private_data->ns_mapper.prefixless_xmlns_ns = NULL;
zend_hash_init(&private_data->ns_mapper.uri_to_prefix_map, 0, NULL, ZVAL_PTR_DTOR, false);
zend_hash_init(&private_data->ns_mapper.uri_to_prefix_map, 0, NULL, php_dom_libxml_ns_mapper_prefix_map_dtor, false);
private_data->template_fragments = NULL;
return private_data;
}
Expand Down
3 changes: 1 addition & 2 deletions ext/mbstring/mbstring.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3570,8 +3570,7 @@ PHP_FUNCTION(mb_list_encodings)
/* Initialize shared array of supported encoding names
* This is done so that we can check if `mb_list_encodings()` is being
* passed to other mbstring functions using a cheap pointer equality check */
HashTable *array = emalloc(sizeof(HashTable));
zend_hash_init(array, 80, NULL, zval_ptr_dtor_str, false);
HashTable *array = zend_new_array(80);
for (const mbfl_encoding **encodings = mbfl_get_supported_encodings(); *encodings; encodings++) {
zval tmp;
ZVAL_STRING(&tmp, (*encodings)->name);
Expand Down
Loading