diff options
| author | Marcus Boerger <helly@php.net> | 2006-07-24 17:58:32 +0000 |
|---|---|---|
| committer | Marcus Boerger <helly@php.net> | 2006-07-24 17:58:32 +0000 |
| commit | 519ed8e13be3a239318ed6d224e15b2fff090398 (patch) | |
| tree | be0a6d2118cb6ff80abbd14fc07877113cf697e2 /Zend/zend_builtin_functions.c | |
| parent | 53d297a7ea20749b68f01caa4ac37066861fd1da (diff) | |
| download | php-git-519ed8e13be3a239318ed6d224e15b2fff090398.tar.gz | |
- Better fix for #34505 and related, drop zend_unmangle_property_name_ex()
Diffstat (limited to 'Zend/zend_builtin_functions.c')
| -rw-r--r-- | Zend/zend_builtin_functions.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c index 6807067cc6..89366b0c6d 100644 --- a/Zend/zend_builtin_functions.c +++ b/Zend/zend_builtin_functions.c @@ -723,7 +723,7 @@ static void add_class_vars(zend_class_entry *ce, HashTable *properties, zval *re zend_hash_get_current_key_ex(properties, &key, &key_len, &num_index, 0, &pos); zend_hash_move_forward_ex(properties, &pos); - zend_unmangle_property_name_ex(key, key_len, &class_name, &prop_name); + zend_unmangle_property_name(key, key_len-1, &class_name, &prop_name); if (class_name) { if (class_name[0] != '*' && strcmp(class_name, ce->name)) { /* filter privates from base classes */ @@ -820,7 +820,7 @@ ZEND_FUNCTION(get_object_vars) (*value)->refcount++; add_assoc_zval_ex(return_value, key, key_len, *value); } else if (instanceof) { - zend_unmangle_property_name_ex(key, key_len, &class_name, &prop_name); + zend_unmangle_property_name(key, key_len-1, &class_name, &prop_name); if (!memcmp(class_name, "*", 2) || (Z_OBJCE_P(EG(This)) == Z_OBJCE_PP(obj) && !strcmp(Z_OBJCE_P(EG(This))->name, class_name))) { /* Not separating references */ (*value)->refcount++; @@ -969,7 +969,7 @@ ZEND_FUNCTION(property_exists) if (property_info->flags & ZEND_ACC_PUBLIC) { RETURN_TRUE; } - zend_unmangle_property_name_ex(property_info->name, property_info->name_length, &class_name, &prop_name); + zend_unmangle_property_name(property_info->name, property_info->name_length, &class_name, &prop_name); if (!strncmp(class_name, "*", 1)) { if (instanceof_function(EG(scope), ce TSRMLS_CC)) { RETURN_TRUE; |