ext/dom: abort custom __debugInfo() on exception

Author: Girgias

ext/dom/php_dom.c

@@ -523,7 +523,9 @@ static HashTable* dom_get_debug_info_helper(zend_object *object, int *is_temp) /
 		ZEND_ASSERT(string_key != NULL);
 
 		if (entry->read_func(obj, &value) == FAILURE) {
-			continue;
+			zend_array_release(debug_info);
+			debug_info = NULL;
+			goto exit;
 		}
 
 		if (Z_TYPE(value) == IS_OBJECT) {
@@ -535,6 +537,7 @@ static HashTable* dom_get_debug_info_helper(zend_object *object, int *is_temp) /
 		zend_hash_update(debug_info, string_key, &value);
 	} ZEND_HASH_FOREACH_END();
 
+exit:
 	zend_string_release_ex(object_str, false);
 
 	DOM_G(suppress_warnings) = false;

ext/dom/tests/dom_node_debugInfo.phpt

@@ -0,0 +1,17 @@
+--TEST--
+DOMNode custom __debugInfo() should abort at the first exception
+--EXTENSIONS--
+dom
+--FILE--
+<?php
+
+$d = new DOMNode;
+var_dump($d);
+
+?>
+--EXPECTF--
+Fatal error: Uncaught DOMException: Invalid State Error in %s:%d
+Stack trace:
+#0 %s(%d): var_dump(Object(DOMNode))
+#1 {main}
+  thrown in %s on line %d