}
/* }}} */
-static zend_long *zend_get_property_guard(zend_object *zobj, zend_property_info *property_info, zval *member) /* {{{ */
+static zend_long *zend_get_property_guard(zend_object *zobj, zval *member) /* {{{ */
{
- zend_property_info info;
zval stub, *guard;
- zend_string *str = NULL;
- if (!property_info) {
- property_info = &info;
- info.name = Z_STR_P(member);
- } else if(property_info->name->val[0] == '\0'){
- const char *class_name = NULL, *prop_name = NULL;
- size_t prop_name_len;
- zend_unmangle_property_name_ex(property_info->name, &class_name,
- &prop_name, &prop_name_len);
- if (class_name) {
- /* use unmangled name for protected properties */
- str = info.name = zend_string_init(prop_name, prop_name_len, 0);
- property_info = &info;
- }
- }
if (!zobj->guards) {
ALLOC_HASHTABLE(zobj->guards);
zend_hash_init(zobj->guards, 8, NULL, NULL, 0);
- } else if ((guard = zend_hash_find(zobj->guards, property_info->name)) != NULL) {
- if (str) {
- zend_string_release(str);
- }
+ } else if ((guard = zend_hash_find(zobj->guards, Z_STR_P(member))) != NULL) {
return &Z_LVAL_P(guard);
}
ZVAL_LONG(&stub, 0);
- guard = zend_hash_add_new(zobj->guards, property_info->name, &stub);
- if (str) {
- zend_string_release(str);
- }
+ guard = zend_hash_add_new(zobj->guards, Z_STR_P(member), &stub);
return &Z_LVAL_P(guard);
}
/* }}} */
/* magic get */
if (zobj->ce->__get) {
- zend_long *guard = zend_get_property_guard(zobj, property_info, member);
+ zend_long *guard = zend_get_property_guard(zobj, member);
if (!((*guard) & IN_GET)) {
zval tmp_object;
/* magic set */
if (zobj->ce->__set) {
- zend_long *guard = zend_get_property_guard(zobj, property_info, member);
+ zend_long *guard = zend_get_property_guard(zobj, member);
if (!((*guard) & IN_SET)) {
zval tmp_object;
}
if (!zobj->ce->__get ||
- (guard = zend_get_property_guard(zobj, property_info, member)) == NULL ||
+ (guard = zend_get_property_guard(zobj, member)) == NULL ||
(property_info && ((*guard) & IN_GET))) {
ZVAL_NULL(&tmp);
/* magic unset */
if (zobj->ce->__unset) {
- zend_long *guard = zend_get_property_guard(zobj, property_info, member);
+ zend_long *guard = zend_get_property_guard(zobj, member);
if (!((*guard) & IN_UNSET)) {
zval tmp_object;
result = 0;
if ((has_set_exists != 2) && zobj->ce->__isset) {
- zend_long *guard = zend_get_property_guard(zobj, property_info, member);
+ zend_long *guard = zend_get_property_guard(zobj, member);
if (!((*guard) & IN_ISSET)) {
zval rv;