feedback

Author: devnexen

ext/standard/tests/general_functions/gh20840.phpt

@@ -28,18 +28,11 @@ for ($i = 0; $i < 5000; $i++) {
     $node = $newNode;
 }
 
-try {
-    var_dump($firstNode);
-} catch (Error $e) {
-    echo $e->getMessage(), "\n";
-}
+var_dump($firstNode);
 
 while ($next = $firstNode->next) {
     $firstNode->next = $next->next;
 }
 ?>
 --EXPECTF--
-object(Node)#1 (1) {
-%a
-}
-Maximum call stack size of %d bytes (zend.max_allowed_stack_size - zend.reserved_stack_size) reached. Infinite recursion?
+object(Node)#%d (%d) {%anesting level too deep%a}

ext/standard/var.c

@@ -67,38 +67,38 @@ static void php_object_property_dump(zend_property_info *prop_info, zval *zv, ze
 {
 	const char *prop_name, *class_name;
 
-	if (UNEXPECTED(php_serialize_check_stack_limit())) {
-		return;
-	}
-
-	if (key == NULL) { /* numeric key */
-		php_printf("%*c[" ZEND_LONG_FMT "]=>\n", level + 1, ' ', index);
-	} else { /* string key */
-		int unmangle = zend_unmangle_property_name(key, &class_name, &prop_name);
-		php_printf("%*c[", level + 1, ' ');
-
-		if (class_name && unmangle == SUCCESS) {
-			if (class_name[0] == '*') {
-				php_printf("\"%s\":protected", prop_name);
+	if (UNEXPECTED(zend_call_stack_overflowed(EG(stack_limit)))) {
+		php_printf("%*cnesting level too deep", level + 1, ' ');
+	} else {
+		if (key == NULL) { /* numeric key */
+			php_printf("%*c[" ZEND_LONG_FMT "]=>\n", level + 1, ' ', index);
+		} else { /* string key */
+			int unmangle = zend_unmangle_property_name(key, &class_name, &prop_name);
+			php_printf("%*c[", level + 1, ' ');
+
+			if (class_name && unmangle == SUCCESS) {
+				if (class_name[0] == '*') {
+					php_printf("\"%s\":protected", prop_name);
+				} else {
+					php_printf("\"%s\":\"%s\":private", prop_name, class_name);
+				}
 			} else {
-				php_printf("\"%s\":\"%s\":private", prop_name, class_name);
+				php_printf("\"");
+				PHPWRITE(ZSTR_VAL(key), ZSTR_LEN(key));
+				php_printf("\"");
 			}
-		} else {
-			php_printf("\"");
-			PHPWRITE(ZSTR_VAL(key), ZSTR_LEN(key));
-			php_printf("\"");
+			ZEND_PUTS("]=>\n");
 		}
-		ZEND_PUTS("]=>\n");
-	}
 
-	if (Z_TYPE_P(zv) == IS_UNDEF) {
-		ZEND_ASSERT(ZEND_TYPE_IS_SET(prop_info->type));
-		zend_string *type_str = zend_type_to_string(prop_info->type);
-		php_printf("%*cuninitialized(%s)\n",
-			level + 1, ' ', ZSTR_VAL(type_str));
-		zend_string_release(type_str);
-	} else {
-		php_var_dump(zv, level + 2);
+		if (Z_TYPE_P(zv) == IS_UNDEF) {
+			ZEND_ASSERT(ZEND_TYPE_IS_SET(prop_info->type));
+			zend_string *type_str = zend_type_to_string(prop_info->type);
+			php_printf("%*cuninitialized(%s)\n",
+					level + 1, ' ', ZSTR_VAL(type_str));
+			zend_string_release(type_str);
+		} else {
+			php_var_dump(zv, level + 2);
+		}
 	}
 }
 /* }}} */