Skip to content

zend_hash: Assert that the interned parameter is not a lie#19843

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

Merged
TimWolla merged 2 commits into from
Sep 16, 2025
Merged

zend_hash: Assert that the interned parameter is not a lie #19843

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
93948f7
zend_hash: Assert that the `interned` parameter is not a lie
TimWolla Sep 15, 2025
a1c9f50
zend_hash: Rename `interned` parameter name to `key_guaranteed_interned`
TimWolla Sep 16, 2025
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
10 changes: 6 additions & 4 deletions Zend/zend_hash.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1621,14 +1621,15 @@ static zend_always_inline bool zend_array_is_list(const zend_array *array)
}


static zend_always_inline zval *_zend_hash_append_ex(HashTable *ht, zend_string *key, zval *zv, bool interned)
static zend_always_inline zval *_zend_hash_append_ex(HashTable *ht, zend_string *key, zval *zv, bool key_guaranteed_interned)
{
uint32_t idx = ht->nNumUsed++;
uint32_t nIndex;
Bucket *p = ht->arData + idx;

ZVAL_COPY_VALUE(&p->val, zv);
if (!interned && !ZSTR_IS_INTERNED(key)) {
ZEND_ASSERT(!key_guaranteed_interned || ZSTR_IS_INTERNED(key));
if (!key_guaranteed_interned && !ZSTR_IS_INTERNED(key)) {
HT_FLAGS(ht) &= ~HASH_FLAG_STATIC_KEYS;
zend_string_addref(key);
zend_string_hash_val(key);
Expand All@@ -1647,14 +1648,15 @@ static zend_always_inline zval *_zend_hash_append(HashTable *ht, zend_string *ke
return _zend_hash_append_ex(ht, key, zv, 0);
}

static zend_always_inline zval *_zend_hash_append_ptr_ex(HashTable *ht, zend_string *key, void *ptr, bool interned)
static zend_always_inline zval *_zend_hash_append_ptr_ex(HashTable *ht, zend_string *key, void *ptr, bool key_guaranteed_interned)
{
uint32_t idx = ht->nNumUsed++;
uint32_t nIndex;
Bucket *p = ht->arData + idx;

ZVAL_PTR(&p->val, ptr);
if (!interned && !ZSTR_IS_INTERNED(key)) {
ZEND_ASSERT(!key_guaranteed_interned || ZSTR_IS_INTERNED(key));
if (!key_guaranteed_interned && !ZSTR_IS_INTERNED(key)) {
HT_FLAGS(ht) &= ~HASH_FLAG_STATIC_KEYS;
zend_string_addref(key);
zend_string_hash_val(key);
Expand Down