helly Thu Nov 1 16:54:43 2007 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard var.c
Log:
- MFH missing get_debug_info piece
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/var.c?r1=1.203.2.7.2.18.2.2&r2=1.203.2.7.2.18.2.3&diff_format=u
Index: php-src/ext/standard/var.c
diff -u php-src/ext/standard/var.c:1.203.2.7.2.18.2.2
php-src/ext/standard/var.c:1.203.2.7.2.18.2.3
--- php-src/ext/standard/var.c:1.203.2.7.2.18.2.2 Thu Oct 11 01:03:03 2007
+++ php-src/ext/standard/var.c Thu Nov 1 16:54:43 2007
@@ -18,9 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: var.c,v 1.203.2.7.2.18.2.2 2007/10/11 01:03:03 helly Exp $ */
-
-
+/* $Id: var.c,v 1.203.2.7.2.18.2.3 2007/11/01 16:54:43 helly Exp $ */
/* {{{ includes
*/
@@ -258,6 +256,7 @@
zend_uint class_name_len;
zend_class_entry *ce;
int (*zval_element_dump_func)(zval**, int, va_list, zend_hash_key*);
+ int is_temp = 0;
if (level > 1) {
php_printf("%*c", level - 1, ' ');
@@ -274,8 +273,7 @@
php_printf("%slong(%ld) refcount(%u)\n", COMMON,
Z_LVAL_PP(struc), Z_REFCOUNT_PP(struc));
break;
case IS_DOUBLE:
- php_printf("%sdouble(%.*G) refcount(%u)\n", COMMON, (int)
EG(precision), Z_DVAL_PP(struc),
-Z_REFCOUNT_PP(struc));
+ php_printf("%sdouble(%.*G) refcount(%u)\n", COMMON, (int)
EG(precision), Z_DVAL_PP(struc), Z_REFCOUNT_PP(struc));
break;
case IS_STRING:
php_printf("%sstring(%d) \"", COMMON, Z_STRLEN_PP(struc));
@@ -292,19 +290,23 @@
zval_element_dump_func = zval_array_element_dump;
goto head_done;
case IS_OBJECT:
- myht = Z_OBJPROP_PP(struc);
+ myht = Z_OBJDEBUG_PP(struc, is_temp);
if (myht && myht->nApplyCount > 1) {
PUTS("*RECURSION*\n");
return;
}
- ce = Z_OBJCE(**struc);
- Z_OBJ_HANDLER(**struc, get_class_name)(*struc, &class_name,
&class_name_len, 0 TSRMLS_CC);
+ ce = Z_OBJCE_PP(struc);
+ Z_OBJ_HANDLER_PP(struc, get_class_name)(*struc, &class_name,
&class_name_len, 0 TSRMLS_CC);
php_printf("%sobject(%s)#%d (%d) refcount(%u){\n", COMMON,
class_name, Z_OBJ_HANDLE_PP(struc), myht ? zend_hash_num_elements(myht) : 0,
Z_REFCOUNT_PP(struc));
efree(class_name);
zval_element_dump_func = zval_object_property_dump;
head_done:
if (myht) {
zend_hash_apply_with_arguments(myht,
(apply_func_args_t) zval_element_dump_func, 1, level, (Z_TYPE_PP(struc) ==
IS_ARRAY ? 0 : 1));
+ if (is_temp) {
+ zend_hash_destroy(myht);
+ efree(myht);
+ }
}
if (level > 1) {
php_printf("%*c", level-1, ' ');
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
