X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-propro;a=blobdiff_plain;f=php_propro.c;h=c92d6d4a3f7754da92505947919ca129ee9d3073;hp=db0472007ca2d90e4f49d69934c0b89bcb9d0337;hb=18896658482f619ab050506ffea3d5379dba40c1;hpb=ca9aa25ab037d37266d13c4fca034955e1c61539 diff --git a/php_propro.c b/php_propro.c index db04720..c92d6d4 100644 --- a/php_propro.c +++ b/php_propro.c @@ -18,7 +18,7 @@ #include #include -#include "php_propro.h" +#include "php_propro_api.h" #define DEBUG_PROPRO 0 @@ -35,8 +35,7 @@ php_property_proxy_t *php_property_proxy_init(zval *container, zend_string *memb php_property_proxy_t *proxy = ecalloc(1, sizeof(*proxy)); ZVAL_COPY(&proxy->container, get_referenced_zval(container)); - zend_string_addref(member); - proxy->member = member; + proxy->member = zend_string_copy(member); return proxy; } @@ -146,8 +145,8 @@ static void debug_propro(int inout, const char *f, #define debug_propro(l, f, obj, off, val) #endif -static php_property_proxy_object_t *new_propro(zend_class_entry *ce, - php_property_proxy_t *proxy) +php_property_proxy_object_t *php_property_proxy_object_new_ex( + zend_class_entry *ce, php_property_proxy_t *proxy) { php_property_proxy_object_t *o; @@ -167,9 +166,9 @@ static php_property_proxy_object_t *new_propro(zend_class_entry *ce, return o; } -static zend_object *create_obj(zend_class_entry *ce) +zend_object *php_property_proxy_object_new(zend_class_entry *ce) { - return &new_propro(ce, NULL)->zo; + return &php_property_proxy_object_new_ex(ce, NULL)->zo; } static void destroy_obj(zend_object *object) @@ -185,6 +184,7 @@ static void destroy_obj(zend_object *object) zval_ptr_dtor(&o->parent); ZVAL_UNDEF(&o->parent); } + zend_object_std_dtor(object); } static inline php_property_proxy_object_t *get_propro(zval *object) @@ -234,7 +234,7 @@ static zval *get_parent_proxied_value(zval *object, zval *return_value) static zval *get_proxied_value(zval *object, zval *return_value) { - zval *hash_value, *ref; + zval *hash_value, *ref, prop_tmp; php_property_proxy_object_t *obj; obj = get_propro(object); @@ -258,7 +258,7 @@ static zval *get_proxied_value(zval *object, zval *return_value) switch (Z_TYPE_P(ref)) { case IS_OBJECT: RETVAL_ZVAL(zend_read_property(Z_OBJCE_P(ref), ref, - obj->proxy->member->val, obj->proxy->member->len, 0), + obj->proxy->member->val, obj->proxy->member->len, 0, &prop_tmp), 0, 0); break; @@ -318,7 +318,7 @@ static void set_proxied_value(zval *object, zval *value) switch (Z_TYPE_P(ref)) { case IS_OBJECT: zend_update_property(Z_OBJCE_P(ref), ref, obj->proxy->member->val, - obj->proxy->member->len, value TSRMLS_CC); + obj->proxy->member->len, value); break; default: @@ -342,7 +342,7 @@ static void set_proxied_value(zval *object, zval *value) static zval *read_dimension(zval *object, zval *offset, int type, zval *return_value) { zval proxied_value; - zval *o = offset; + zend_string *member = offset ? zval_get_string(offset) : NULL; debug_propro(1, type == BP_VAR_R ? "dim_read" : "dim_read_ref", get_propro(object), offset, NULL); @@ -350,21 +350,16 @@ static zval *read_dimension(zval *object, zval *offset, int type, zval *return_v ZVAL_UNDEF(&proxied_value); get_proxied_value(object, &proxied_value); - if (o) { - convert_to_string_ex(o); - } - - if (BP_VAR_R == type && o && !Z_ISUNDEF(proxied_value)) { + if (BP_VAR_R == type && member && !Z_ISUNDEF(proxied_value)) { if (Z_TYPE(proxied_value) == IS_ARRAY) { zval *hash_value = zend_symtable_find(Z_ARRVAL(proxied_value), - Z_STR_P(o)); + member); if (hash_value) { RETVAL_ZVAL(hash_value, 1, 0); } } } else { - zend_string *member; php_property_proxy_t *proxy; php_property_proxy_object_t *proxy_obj; @@ -376,9 +371,7 @@ static zval *read_dimension(zval *object, zval *offset, int type, zval *return_v set_proxied_value(object, &proxied_value); } - if (o) { - member = Z_STR_P(o); - } else { + if (!member) { member = zend_long_to_str(zend_hash_next_free_element( Z_ARRVAL(proxied_value))); } @@ -386,17 +379,13 @@ static zval *read_dimension(zval *object, zval *offset, int type, zval *return_v proxy = php_property_proxy_init(&proxied_value, member); zval_ptr_dtor(&proxied_value); - if (!o) { - zend_string_release(member); - } - - proxy_obj = new_propro(NULL, proxy); + proxy_obj = php_property_proxy_object_new_ex(NULL, proxy); ZVAL_COPY(&proxy_obj->parent, object); RETVAL_OBJ(&proxy_obj->zo); } - if (o && o != offset) { - zval_ptr_dtor(o); + if (member) { + zend_string_release(member); } debug_propro(-1, type == BP_VAR_R ? "dim_read" : "dim_read_ref", @@ -417,12 +406,10 @@ static int has_dimension(zval *object, zval *offset, int check_empty) if (Z_ISUNDEF(proxied_value)) { exists = 0; } else { - zval *o = offset; - - convert_to_string_ex(o); + zend_string *zs = zval_get_string(offset); if (Z_TYPE(proxied_value) == IS_ARRAY) { - zval *zentry = zend_symtable_find(Z_ARRVAL(proxied_value), Z_STR_P(o)); + zval *zentry = zend_symtable_find(Z_ARRVAL(proxied_value), zs); if (!zentry) { exists = 0; @@ -435,9 +422,7 @@ static int has_dimension(zval *object, zval *offset, int check_empty) } } - if (o != offset) { - zval_ptr_dtor(o); - } + zend_string_release(zs); } debug_propro(-1, "dim_exists", get_propro(object), offset, NULL); @@ -447,7 +432,7 @@ static int has_dimension(zval *object, zval *offset, int check_empty) static void write_dimension(zval *object, zval *offset, zval *value) { - zval proxied_value, *o = offset; + zval proxied_value; debug_propro(1, "dim_write", get_propro(object), offset, value); @@ -467,17 +452,14 @@ static void write_dimension(zval *object, zval *offset, zval *value) SEPARATE_ZVAL(value); Z_TRY_ADDREF_P(value); - if (o) { - convert_to_string_ex(o); - zend_symtable_update(Z_ARRVAL(proxied_value), Z_STR_P(o), value); + if (offset) { + zend_string *zs = zval_get_string(offset); + zend_symtable_update(Z_ARRVAL(proxied_value), zs, value); + zend_string_release(zs); } else { zend_hash_next_index_insert(Z_ARRVAL(proxied_value), value); } - if (o && o != offset) { - zval_ptr_dtor(o); - } - set_proxied_value(object, &proxied_value); debug_propro(-1, "dim_write", get_propro(object), offset, &proxied_value); @@ -491,7 +473,8 @@ static void unset_dimension(zval *object, zval *offset) debug_propro(1, "dim_unset", get_propro(object), offset, NULL); - get_proxied_value(object, &proxied_value TSRMLS_CC); + ZVAL_UNDEF(&proxied_value); + get_proxied_value(object, &proxied_value); if (Z_TYPE(proxied_value) == IS_ARRAY) { zval *o = offset; @@ -556,13 +539,13 @@ static PHP_MINIT_FUNCTION(propro) INIT_NS_CLASS_ENTRY(ce, "php", "PropertyProxy", php_property_proxy_method_entry); php_property_proxy_class_entry = zend_register_internal_class(&ce); - php_property_proxy_class_entry->create_object = create_obj; + php_property_proxy_class_entry->create_object = php_property_proxy_object_new; php_property_proxy_class_entry->ce_flags |= ZEND_ACC_FINAL; memcpy(&php_property_proxy_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers)); php_property_proxy_object_handlers.offset = XtOffsetOf(php_property_proxy_object_t, zo); - php_property_proxy_object_handlers.dtor_obj = destroy_obj; + php_property_proxy_object_handlers.free_obj = destroy_obj; php_property_proxy_object_handlers.set = set_proxied_value; php_property_proxy_object_handlers.get = get_proxied_value; php_property_proxy_object_handlers.cast_object = cast_proxied_value;