From: Dmitry Stogov <dmitry@php.net>
Date: Thu, 21 Jul 2005 07:18:02 +0000 (+0000)
Subject: Recursion protection
X-Git-Tag: RELEASE_0_9~46
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e4b1fb64551a161af1dccb4ff4a3914a11bedaf2;p=php

Recursion protection
---

diff --git a/ext/standard/var.c b/ext/standard/var.c
index 1343802143..941f68292c 100644
--- a/ext/standard/var.c
+++ b/ext/standard/var.c
@@ -252,10 +252,18 @@ PHPAPI void php_debug_zval_dump(zval **struc, int level TSRMLS_DC)
 		break;
 	case IS_ARRAY:
 		myht = Z_ARRVAL_PP(struc);
+		if (myht->nApplyCount > 1) {
+			PUTS("*RECURSION*\n");
+			return;
+		}
 		php_printf("%sarray(%d) refcount(%u){\n", COMMON, zend_hash_num_elements(myht), Z_REFCOUNT_PP(struc));
 		goto head_done;
 	case IS_OBJECT:
 		myht = Z_OBJPROP_PP(struc);
+		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);
 		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));