Stop execution of print_r on error

Author: iluuu1994

Zend/tests/debug_info-error-0.phpt

@@ -17,7 +17,7 @@ $c = new C(0);
 var_dump($c);
 ?>
 --EXPECTF--
-Fatal error: Uncaught Error: __debuginfo() must return an array in __debuginfo() must return an array in %s%eZend%etests%edebug_info-error-0.php:14
+Fatal error: Uncaught Error: __debuginfo() must return an array in %s:%d
 Stack trace:
 #0 %s(14): var_dump(Object(C))
 #1 {main}

Zend/tests/gh7922.phpt

@@ -10,84 +10,90 @@ class A
     }
 }
 
+echo "Exception in __debugInfo:\n";
+
 try {
-    $a = new A();
-    print_r($a);
+    print_r(new A());
 } catch (\Throwable $e) {
-    echo (string) $e . "\n";
+    echo $e . "\n";
 }
 
+echo "\nException in __debugInfo in anonymous class:\n";
+
 try {
-    $a = new class() extends A {
+    print_r(new class() extends A {
         public function __debugInfo(): array
         {
             throw new \Exception('y');
         }
-    };
-    print_r($a, true);
+    });
 } catch (\Throwable $e) {
-    echo (string) $e . "\n";
+    echo $e . "\n";
 }
 
+echo "\nException in __destruct of __debugInfo in anonymous class:\n";
+
 try {
-    $a = new class() extends A {
+    print_r(new class() extends A {
         public function __debugInfo(): array
         {
-            new class() {
+            $o = new class() {
                 public function __destruct()
                 {
-                    throw new \Exception('z_wo_assign');
+                    throw new \Exception('z_w_assign');
                 }
             };
 
             return ['foo' => 2];
         }
-    };
-    print_r($a);
+    });
 } catch (\Throwable $e) {
-    echo (string) $e . "\n";
+    echo $e . "\n";
 }
 
-try {
-    $a = new class() extends A {
-        public function __debugInfo(): array
-        {
-            $o = new class() {
-                public function __destruct()
-                {
-                    throw new \Exception('z_w_assign');
-                }
-            };
+echo "\nException occuring later on:\n";
 
-            return ['foo' => 2];
-        }
-    };
-    print_r($a);
+try {
+    print_r(['foo' => 'bar', 'baz' => new A()]);
 } catch (\Throwable $e) {
-    echo (string) $e . "\n";
+    echo $e . "\n";
 }
+
 ?>
 --EXPECTF--
-Error: x in %s:6
+Exception in __debugInfo:
+A Object
+Error: x in %s:%d
 Stack trace:
 #0 [internal function]: A->__debugInfo()
-#1 %s(12): print_r(Object(A))
+#1 %s(%d): print_r(Object(A))
 #2 {main}
 
-Exception: y in %s:21
+Exception in __debugInfo in anonymous class:
+A@anonymous Object
+Exception: y in %s:%d
 Stack trace:
 #0 [internal function]: A@anonymous->__debugInfo()
-#1 %s(24): print_r(Object(A@anonymous), true)
+#1 %s(%d): print_r(Object(A@anonymous))
 #2 {main}
 
-Exception: z_wo_assign in %s:35
+Exception in __destruct of __debugInfo in anonymous class:
+A@anonymous Object
+Exception: z_w_assign in %s:%d
 Stack trace:
-#0 [internal function]: A@anonymous->__destruct()
-#1 %s(42): print_r(Object(A@anonymous))
+#0 [internal function]: class@anonymous->__destruct()
+#1 %s(%d): print_r(Object(A@anonymous))
 #2 {main}
 
-Exception: z_w_assign in %s:54
+Exception occuring later on:
+Array
+(
+    [foo] => bar
+    [baz] => A Object
+
+)
+Error: x in %s:%d
 Stack trace:
-#0 [internal function]: A@anonymous->__destruct()
-#1 %s(61): print_r(Object(A@anonymous))
+#0 [internal function]: A->__debugInfo()
+#1 %s(%d): print_r(Array)
 #2 {main}

Zend/zend_object_handlers.c

@@ -164,6 +164,11 @@ ZEND_API HashTable *zend_std_get_debug_info(zend_object *object, int *is_temp) /
 	}
 
 	zend_call_known_instance_method_with_0_params(ce->__debugInfo, object, &retval);
+	if (EG(exception)) {
+		zval_ptr_dtor(&retval);
+		return NULL;
+	}
+
 	switch (Z_TYPE(retval)) {
 		case IS_ARRAY:
 			if (!Z_REFCOUNTED(retval)) {
@@ -178,14 +183,14 @@ ZEND_API HashTable *zend_std_get_debug_info(zend_object *object, int *is_temp) /
 				zval_ptr_dtor(&retval);
 				return Z_ARRVAL(retval);
 			}
-		default:
-			zend_throw_error(NULL, ZEND_DEBUGINFO_FUNC_NAME "() must return an array");
-			zval_ptr_dtor(&retval);
-			/* fallthrough */
 		case IS_NULL:
 			*is_temp = 1;
 			ht = zend_new_array(0);
 			return ht;
+		default:
+			zend_throw_error(NULL, ZEND_DEBUGINFO_FUNC_NAME "() must return an array");
+			zval_ptr_dtor(&retval);
+			return NULL;
 	}
 
 	return NULL; /* Compilers are dumb and don't understand that noreturn means that the function does NOT need a return value... */

ext/standard/var.c

@@ -161,6 +161,9 @@ PHPAPI void php_var_dump(zval *struc, int level) /* {{{ */
 			Z_PROTECT_RECURSION_P(struc);
 
 			myht = zend_get_properties_for(struc, ZEND_PROP_PURPOSE_DEBUG);
+			if (EG(exception)) {
+				break;
+			}
 			class_name = Z_OBJ_HANDLER_P(struc, get_class_name)(Z_OBJ_P(struc));
 			php_printf("%sobject(%s)#%d (%d) {\n", COMMON, ZSTR_VAL(class_name), Z_OBJ_HANDLE_P(struc), myht ? zend_array_count(myht) : 0);
 			zend_string_release_ex(class_name, 0);