Merge branch 'PHP-8.4'

* PHP-8.4: Fix tests: Prevent stack overflow during dtor
php · Oct 24, 2024 · c5a5707 · c5a5707
2 parents 551a9ef + 4c212b3
commit c5a5707
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/ext/json/tests/gh15168.phpt b/ext/json/tests/gh15168.phpt
@@ -31,6 +31,10 @@ var_dump(json_encode($firstNode, depth: 500000));
 var_dump(json_last_error());
 var_dump(json_last_error_msg());
 
+while ($next = $firstNode->next) {
+    $firstNode->next = $next->next;
+}
+
 ?>
 --EXPECT--
 bool(false)

diff --git a/ext/standard/tests/serialize/gh15169.phpt b/ext/standard/tests/serialize/gh15169.phpt
@@ -30,6 +30,11 @@ try {
 } catch (Error $e) {
     echo $e->getMessage(), "\n";
 }
+
+while ($next = $firstNode->next) {
+    $firstNode->next = $next->next;
+}
+
 ?>
 --EXPECTF--
 Maximum call stack size of %d bytes (zend.max_allowed_stack_size - zend.reserved_stack_size) reached. Infinite recursion?