clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-21 18:07:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't intern strings in-place if their refcoung greater than 1

Browse Source
This commit is contained in:
Dmitry Stogov 2017-11-03 21:00:07 +03:00
parent 3d12e70459
commit 26b2b27a25
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Zend/zend_string.c
View File

@ -169,6 +169,14 @@ static zend_string *zend_new_interned_string_permanent(zend_string *str)
return ret;
}
ZEND_ASSERT(GC_FLAGS(str) & GC_PERSISTENT);
if (GC_REFCOUNT(str) > 1) {
zend_ulong h = ZSTR_H(str);
zend_string_delref(str);
str = zend_string_init(ZSTR_VAL(str), ZSTR_LEN(str), 1);
ZSTR_H(str) = h;
}
return zend_add_interned_string(str, &interned_strings_permanent, IS_STR_PERMANENT);
}
@ -196,6 +204,14 @@ static zend_string *zend_new_interned_string_request(zend_string *str)
}
/* Create a short living interned, freed after the request. */
ZEND_ASSERT(!(GC_FLAGS(str) & GC_PERSISTENT));
if (GC_REFCOUNT(str) > 1) {
zend_ulong h = ZSTR_H(str);
zend_string_delref(str);
str = zend_string_init(ZSTR_VAL(str), ZSTR_LEN(str), 0);
ZSTR_H(str) = h;
}
ret = zend_add_interned_string(str, &CG(interned_strings), 0);
return ret;