diff options
Diffstat (limited to 'Zend/zend_string.c')
| -rw-r--r-- | Zend/zend_string.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/Zend/zend_string.c b/Zend/zend_string.c index 4e7bcfc9fc..612c8049ef 100644 --- a/Zend/zend_string.c +++ b/Zend/zend_string.c @@ -74,7 +74,7 @@ ZEND_KNOWN_STRINGS(_ZEND_STR_DSC) void zend_known_interned_strings_init(zend_string ***strings, uint32_t *count) { - *strings = known_interned_strings; + *strings = (zend_string **)known_interned_strings; *count = known_interned_strings_count; } @@ -161,7 +161,6 @@ static zend_string *zend_new_interned_string_int(zend_string *str) void *old_data = HT_GET_DATA_ADDR(&CG(interned_strings)); Bucket *old_buckets = CG(interned_strings).arData; - HANDLE_BLOCK_INTERRUPTIONS(); CG(interned_strings).nTableSize += CG(interned_strings).nTableSize; CG(interned_strings).nTableMask = -CG(interned_strings).nTableSize; new_data = malloc(HT_SIZE(&CG(interned_strings))); @@ -175,12 +174,9 @@ static zend_string *zend_new_interned_string_int(zend_string *str) CG(interned_strings).nTableSize = CG(interned_strings).nTableSize >> 1; CG(interned_strings).nTableMask = -CG(interned_strings).nTableSize; } - HANDLE_UNBLOCK_INTERRUPTIONS(); } } - HANDLE_BLOCK_INTERRUPTIONS(); - idx = CG(interned_strings).nNumUsed++; CG(interned_strings).nNumOfElements++; p = CG(interned_strings).arData + idx; @@ -192,8 +188,6 @@ static zend_string *zend_new_interned_string_int(zend_string *str) Z_NEXT(p->val) = HT_HASH(&CG(interned_strings), nIndex); HT_HASH(&CG(interned_strings), nIndex) = HT_IDX_TO_HASH(idx); - HANDLE_UNBLOCK_INTERRUPTIONS(); - return str; #else return str; |