diff options
Diffstat (limited to 'Zend/zend_string.c')
| -rw-r--r-- | Zend/zend_string.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Zend/zend_string.c b/Zend/zend_string.c index 3fde993bfe..40378a576e 100644 --- a/Zend/zend_string.c +++ b/Zend/zend_string.c @@ -56,7 +56,7 @@ void zend_interned_strings_init(void) /* interned empty string */ str = zend_string_alloc(sizeof("")-1, 1); - str->val[0] = '\000'; + ZSTR_VAL(str)[0] = '\000'; CG(empty_string) = zend_new_interned_string_int(str); #endif @@ -92,8 +92,8 @@ static zend_string *zend_new_interned_string_int(zend_string *str) idx = HT_HASH(&CG(interned_strings), nIndex); while (idx != HT_INVALID_IDX) { p = HT_HASH_TO_BUCKET(&CG(interned_strings), idx); - if ((p->h == h) && (p->key->len == str->len)) { - if (!memcmp(p->key->val, str->val, str->len)) { + if ((p->h == h) && (ZSTR_LEN(p->key) == ZSTR_LEN(str))) { + if (!memcmp(ZSTR_VAL(p->key), ZSTR_VAL(str), ZSTR_LEN(str))) { zend_string_release(str); return p->key; } |