- MFH zend_unmangle_property_name(), drop zend_unmangle_property_name_ex()

diff --git a/ext/reflection/php_reflection.c b/ext/reflection/php_reflection.c
index de1b6435e93ebf90cccbceb4ad0f761e47f36751..59b9ddf5205192750dee55e1cac8fa275834acb5 100644 (file)
--- a/ext/reflection/php_reflection.c
+++ b/ext/reflection/php_reflection.c
@@ -781,7 +781,7 @@ static void _property_string(string *str, zend_property_info *prop, char *prop_n
                        string_printf(str, "static ");
                }
 
-               zend_unmangle_property_name(prop->name, &class_name, &prop_name);
+               zend_unmangle_property_name(prop->name, prop->name_length, &class_name, &prop_name);
                string_printf(str, "$%s", prop_name);
        }
 
@@ -1103,7 +1103,7 @@ static void reflection_property_factory(zend_class_entry *ce, zend_property_info
        property_reference *reference;
        char *class_name, *prop_name;
 
-       zend_unmangle_property_name(prop->name, &class_name, &prop_name);
+       zend_unmangle_property_name(prop->name, prop->name_length, &class_name, &prop_name);
 
        if (!(prop->flags & ZEND_ACC_PRIVATE)) {
                /* we have to seach the class hierarchy for this (implicit) public or protected property */
@@ -2733,7 +2733,7 @@ ZEND_METHOD(reflection_class, getDefaultProperties)
 
                        zend_hash_get_current_key_ex(&ce->default_properties, &key, &key_len, &num_index, 0, &pos);
                        zend_hash_move_forward_ex(&ce->default_properties, &pos);
-                       zend_unmangle_property_name(key, &class_name, &prop_name);
+                       zend_unmangle_property_name(key, key_len-1, &class_name, &prop_name);
                        if (class_name && class_name[0] != '*' && strcmp(class_name, ce->name)) {
                                /* filter privates from base classes */
                                continue;
@@ -3729,7 +3729,7 @@ ZEND_METHOD(reflection_property, __construct)
        ZVAL_STRINGL(classname, ce->name, ce->name_length, 1);
        zend_hash_update(Z_OBJPROP_P(object), "class", sizeof("class"), (void **) &classname, sizeof(zval *), NULL);
        
-       zend_unmangle_property_name(property_info->name, &class_name, &prop_name);
+       zend_unmangle_property_name(property_info->name, property_info->name_length, &class_name, &prop_name);
        MAKE_STD_ZVAL(propname);
        ZVAL_STRING(propname, prop_name, 1);
        zend_hash_update(Z_OBJPROP_P(object), "name", sizeof("name"), (void **) &propname, sizeof(zval *), NULL);

diff --git a/ext/soap/php_encoding.c b/ext/soap/php_encoding.c
index 52f784897d089fff1b9f2af1e601a511889800f7..2c92e5dd0f2058194e317f3cb695aae972f8a815 100644 (file)
--- a/ext/soap/php_encoding.c
+++ b/ext/soap/php_encoding.c
@@ -1769,7 +1769,7 @@ static xmlNodePtr to_xml_object(encodeTypePtr type, zval *data, int style, xmlNo
                                        if (Z_TYPE_P(data) == IS_OBJECT) {
                                                char *class_name;
 
-                                               zend_unmangle_property_name_ex(str_key, str_key_len, &class_name, &prop_name);
+                                               zend_unmangle_property_name(str_key, str_key_len-1, &class_name, &prop_name);
                                        } else {
                                                prop_name = str_key;
                                        }

diff --git a/ext/standard/http.c b/ext/standard/http.c
index 35d9135c622d7288bdac42769ba5d0df9a222d5f..b624c99b848429a2773c735de4090c400a2337cc 100644 (file)
--- a/ext/standard/http.c
+++ b/ext/standard/http.c
@@ -67,11 +67,11 @@ PHPAPI int php_url_encode_hash_ex(HashTable *ht, smart_str *formstr,
                        char *tmp;
 
                        zend_object *zobj = zend_objects_get_address(type TSRMLS_CC);
-                       if (zend_check_property_access(zobj, key TSRMLS_CC) != SUCCESS) {
+                       if (zend_check_property_access(zobj, key, key_len-1 TSRMLS_CC) != SUCCESS) {
                                /* private or protected property access outside of the class */
                                continue;
                        }
-                       zend_unmangle_property_name_ex(key, key_len, &tmp, &key);
+                       zend_unmangle_property_name(key, key_len-1, &tmp, &key);
                        key_len = strlen(key);          
                }
 

diff --git a/ext/standard/var.c b/ext/standard/var.c
index eb9547f96807f88747d62ce69778591df66f3e55..990231fe19a97efe1f83735fdf715cfb5646ac33 100644 (file)
--- a/ext/standard/var.c
+++ b/ext/standard/var.c
@@ -76,7 +76,7 @@ static int php_object_property_dump(zval **zv, int num_args, va_list args, zend_
        if (hash_key->nKeyLength ==0 ) { /* numeric key */
                php_printf("%*c[%ld]=>\n", level + 1, ' ', hash_key->h);
        } else { /* string key */
-               zend_unmangle_property_name_ex(hash_key->arKey, hash_key->nKeyLength, &class_name, &prop_name);
+               zend_unmangle_property_name(hash_key->arKey, hash_key->nKeyLength-1, &class_name, &prop_name);
                if (class_name) {
                        php_printf("%*c[\"%s", level + 1, ' ', prop_name);
                        if (class_name[0]=='*') {
@@ -232,7 +232,7 @@ static int zval_object_property_dump(zval **zv, int num_args, va_list args, zend
        if (hash_key->nKeyLength ==0 ) { /* numeric key */
                php_printf("%*c[%ld]=>\n", level + 1, ' ', hash_key->h);
        } else { /* string key */
-               zend_unmangle_property_name_ex(hash_key->arKey, hash_key->nKeyLength, &class_name, &prop_name);
+               zend_unmangle_property_name(hash_key->arKey, hash_key->nKeyLength-1, &class_name, &prop_name);
                if (class_name) {
                        php_printf("%*c[\"%s", level + 1, ' ', prop_name);
                        if (class_name[0]=='*') {
@@ -385,7 +385,7 @@ static int php_object_element_export(zval **zv, int num_args, va_list args, zend
 
        if (hash_key->nKeyLength != 0) {
                php_printf("%*c", level + 1, ' ');
-               zend_unmangle_property_name_ex(hash_key->arKey, hash_key->nKeyLength, &class_name, &prop_name);
+               zend_unmangle_property_name(hash_key->arKey, hash_key->nKeyLength-1, &class_name, &prop_name);
                php_printf(" '%s' => ", prop_name);
                php_var_export(zv, level + 2 TSRMLS_CC);
                PUTS (",\n");

diff --git a/ext/wddx/wddx.c b/ext/wddx/wddx.c
index 02f6b85c6893ac66782f173b6bac603fec1df903..37b94d76641f0e6c4200e251a56d6a24de0a2cfb 100644 (file)
--- a/ext/wddx/wddx.c
+++ b/ext/wddx/wddx.c
@@ -529,7 +529,7 @@ static void php_wddx_serialize_object(wddx_packet *packet, zval *obj)
                        if (zend_hash_get_current_key_ex(HASH_OF(obj), &key, &key_len, &idx, 0, NULL) == HASH_KEY_IS_STRING) {
                                char *class_name, *prop_name;
                                
-                               zend_unmangle_property_name_ex(key, key_len, &class_name, &prop_name);
+                               zend_unmangle_property_name(key, key_len-1, &class_name, &prop_name);
                                php_wddx_serialize_var(packet, *ent, prop_name, strlen(prop_name)+1 TSRMLS_CC);
                        } else {
                                key_len = sprintf(tmp_buf, "%ld", idx);