From: Derick Rethans <derick@php.net>
Date: Tue, 18 Jun 2002 11:09:21 +0000 (+0000)
Subject: - Fix for bug #16065
X-Git-Tag: php-4.3.0dev_zend2_alpha2~205
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ba5257a2ec77043f2907f40cd5bbf60159fb0792;p=php

- Fix for bug #16065
---

diff --git a/ext/standard/var.c b/ext/standard/var.c
index 10aee69b14..a6e9fd01c3 100644
--- a/ext/standard/var.c
+++ b/ext/standard/var.c
@@ -86,30 +86,22 @@ void php_var_dump(zval **struc, int level TSRMLS_DC)
 		break;
 	case IS_ARRAY:
 		myht = Z_ARRVAL_PP(struc);
-		if (++((*struc)->value.ht->nApplyCount) > 1) {
+		if (myht->nApplyCount > 1) {
 			PUTS("*RECURSION*\n");
-			(*struc)->value.ht->nApplyCount = 0;
-			break;
+			return;
 		}
 		php_printf("%sarray(%d) {\n", COMMON, zend_hash_num_elements(myht));
 		goto head_done;
 	case IS_OBJECT:
 		object = Z_OBJ_PP(struc);
-		if (++object->properties->nApplyCount > 1) {
+		if (myht->nApplyCount > 1) {
 			PUTS("*RECURSION*\n");
-			object->properties->nApplyCount = 0;
 			return;
 		}
 		myht = Z_OBJPROP_PP(struc);
 		php_printf("%sobject(%s)(%d) {\n", COMMON, Z_OBJCE_PP(struc)->name, zend_hash_num_elements(myht));
 head_done:
 		zend_hash_apply_with_arguments(myht, (apply_func_args_t) php_array_element_dump, 1, level);
-		if (Z_TYPE_PP(struc) == IS_ARRAY) {
-			(*struc)->value.ht->nApplyCount--;
-		}
-		else {
-			object->properties->nApplyCount--;
-		}
 		if (level > 1) {
 			php_printf("%*c", level-1, ' ');
 		}