Core: convert bail-out for incorect __debugInfo return type to TypeError

Author: Girgias

Zend/tests/debug_info-error-0.0.phpt

@@ -0,0 +1,49 @@
+--TEST--
+Testing __debugInfo() magic method with bad returns
+--FILE--
+<?php
+
+class C {
+    public $val;
+    public function __debugInfo() {
+        return $this->val;
+    }
+    public function __construct($val) {
+        $this->val = $val;
+    }
+}
+
+$VALUES = [
+    false,
+    true,
+    0,
+    0.0,
+    1.0,
+    1,
+    "",
+    "foo",
+    new stdClass(),
+    STDERR,
+];
+
+foreach ($VALUES as $value) {
+    $c = new C($value);
+
+    try {
+        var_dump($c);
+    } catch (Throwable $e) {
+        echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+    }
+}
+?>
+--EXPECT--
+TypeError: __debuginfo() must return an array
+TypeError: __debuginfo() must return an array
+TypeError: __debuginfo() must return an array
+TypeError: __debuginfo() must return an array
+TypeError: __debuginfo() must return an array
+TypeError: __debuginfo() must return an array
+TypeError: __debuginfo() must return an array
+TypeError: __debuginfo() must return an array
+TypeError: __debuginfo() must return an array
+TypeError: __debuginfo() must return an array

Zend/tests/debug_info-error-0.phpt

@@ -573,8 +573,8 @@ static void zend_print_zval_r_to_buf(smart_str *buf, zval *expr, int indent) /*
 				}
 
 				if ((properties = zend_get_properties_for(expr, ZEND_PROP_PURPOSE_DEBUG)) == NULL) {
-					print_hash(buf, (HashTable*) &zend_empty_array, indent, 1);
-					break;
+					/* An exception has been thrown */
+					return;
 				}
 
 				ZEND_GUARD_OR_GC_PROTECT_RECURSION(guard, DEBUG, zobj);

Zend/tests/debug_info-error-1.0.phpt

@@ -159,7 +159,7 @@ ZEND_API HashTable *zend_std_get_debug_info(zend_object *object, int *is_temp) /
 	HashTable *ht;
 
 	if (!ce->__debugInfo) {
-		*is_temp = 0;
+		*is_temp = false;
 		return object->handlers->get_properties(object);
 	}
 
@@ -178,14 +178,14 @@ ZEND_API HashTable *zend_std_get_debug_info(zend_object *object, int *is_temp) /
 			return Z_ARRVAL(retval);
 		}
 	} else if (Z_TYPE(retval) == IS_NULL) {
-		*is_temp = 1;
-		ht = zend_new_array(0);
-		return ht;
+		*is_temp = 0;
+		zval_ptr_dtor(&retval);
+		return (HashTable*)&zend_empty_array;
+	} else {
+		zval_ptr_dtor(&retval);
+		zend_type_error(ZEND_DEBUGINFO_FUNC_NAME "() must return an array");
+		return NULL;
 	}
-
-	zend_error_noreturn(E_ERROR, ZEND_DEBUGINFO_FUNC_NAME "() must return an array");
-
-	return NULL; /* Compilers are dumb and don't understand that noreturn means that the function does NOT need a return value... */
 }
 /* }}} */