diff options
| author | Nikita Popov <nikic@php.net> | 2014-10-09 19:15:07 +0200 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2014-10-09 20:48:27 +0200 |
| commit | df79b9b27af70afe502979c84a981d36ed9d86a8 (patch) | |
| tree | 4a642d706985c960bbfeea70f195aeefe8eb4631 /Zend/zend.c | |
| parent | c061c8294514fb8eae7b96f77839312244a50048 (diff) | |
| download | php-git-df79b9b27af70afe502979c84a981d36ed9d86a8.tar.gz | |
Update get_class_name semantics
* get_class_name is now only used for displaying the class name
in debugging functions like var_dump, print_r, etc. It is no
longer used in get_class() etc.
* As it is no longer used in get_parent_class() the parent
argument is now gone. This also fixes incorrect parent classes
being reported in COM.
* get_class_name is now always required (previously some places
made it optional and some required it) and is also required
to return a non-NULL value.
* Remove zend_get_object_classname. This also fixes a number of
potential leaks due to incorrect usage of this function.
Diffstat (limited to 'Zend/zend.c')
| -rw-r--r-- | Zend/zend.c | 31 |
1 files changed, 7 insertions, 24 deletions
diff --git a/Zend/zend.c b/Zend/zend.c index eb91026a24..7fef34c94e 100644 --- a/Zend/zend.c +++ b/Zend/zend.c @@ -263,19 +263,10 @@ ZEND_API void zend_print_flat_zval_r(zval *expr TSRMLS_DC) /* {{{ */ case IS_OBJECT: { HashTable *properties = NULL; - zend_string *class_name = NULL; + zend_string *class_name = Z_OBJ_HANDLER_P(expr, get_class_name)(Z_OBJ_P(expr) TSRMLS_CC); + zend_printf("%s Object (", class_name->val); + zend_string_release(class_name); - if (Z_OBJ_HANDLER_P(expr, get_class_name)) { - class_name = Z_OBJ_HANDLER_P(expr, get_class_name)(Z_OBJ_P(expr), 0 TSRMLS_CC); - } - if (class_name) { - zend_printf("%s Object (", class_name->val); - } else { - zend_printf("%s Object (", "Unknown Class"); - } - if (class_name) { - zend_string_release(class_name); - } if (Z_OBJ_HANDLER_P(expr, get_properties)) { properties = Z_OBJPROP_P(expr); } @@ -324,21 +315,13 @@ ZEND_API void zend_print_zval_r_ex(zend_write_func_t write_func, zval *expr, int case IS_OBJECT: { HashTable *properties; - zend_string *class_name = NULL; int is_temp; - if (Z_OBJ_HANDLER_P(expr, get_class_name)) { - class_name = Z_OBJ_HANDLER_P(expr, get_class_name)(Z_OBJ_P(expr), 0 TSRMLS_CC); - } - if (class_name) { - ZEND_PUTS_EX(class_name->val); - } else { - ZEND_PUTS_EX("Unknown Class"); - } + zend_string *class_name = Z_OBJ_HANDLER_P(expr, get_class_name)(Z_OBJ_P(expr) TSRMLS_CC); + ZEND_PUTS_EX(class_name->val); + zend_string_release(class_name); + ZEND_PUTS_EX(" Object\n"); - if (class_name) { - zend_string_release(class_name); - } if ((properties = Z_OBJDEBUG_P(expr, is_temp)) == NULL) { break; } |