[php-src] PHP-8.2: Fix missing handling of CALLABLE_CONVERT in cleanup_unfinished_calls()
| From: | Ilija Tovilo | Date: | Fri, 19 Apr 2024 18:06:40 +0000 |
| Subject: | [php-src] PHP-8.2: Fix missing handling of CALLABLE_CONVERT in cleanup_unfinished_calls() | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-128171@lists.php.net to get a copy of this message | ||
Author: Ilija Tovilo (iluuu1994)
Date: 2024-04-19T20:04:51+02:00
Commit: https://github.com/php/php-src/commit/b3e26c3036a54e9821ea7119c26cdabe484fe36d
Raw diff: https://github.com/php/php-src/commit/b3e26c3036a54e9821ea7119c26cdabe484fe36d.diff
Fix missing handling of CALLABLE_CONVERT in cleanup_unfinished_calls()
Fixes GH-14003
Changed paths:
A Zend/tests/gh14003.phpt
M NEWS
M Zend/zend_execute.c
Diff:
diff --git a/NEWS b/NEWS
index e5f8e3eba5ff3..0cc2d50baf281 100644
--- a/NEWS
+++ b/NEWS
@@ -9,6 +9,8 @@ PHP NEWS
Zend/zend_opcode.c). (nielsdos)
. Fixed bug GH-13942 (Align the behavior of zend-max-execution-timers with
other timeout implementations). (Kévin Dunglas)
+ . Fixed bug GH-14003 (Broken cleanup of unfinished calls with callable convert
+ parameters). (ilutov)
- Fibers:
. Fixed bug GH-13903 (ASAN false positive underflow when executing copy()).
diff --git a/Zend/tests/gh14003.phpt b/Zend/tests/gh14003.phpt
new file mode 100644
index 0000000000000..92a6c5919ab5b
--- /dev/null
+++ b/Zend/tests/gh14003.phpt
@@ -0,0 +1,24 @@
+--TEST--
+GH-14003: Missing handling of CALLABLE_CONVERT in cleanup_unfinished_calls()
+--FILE--
+<?php
+
+function foo(string $key): string {
+ throw new \Exception('Test');
+}
+
+array_filter(
+ array_combine(
+ ['a'],
+ array_map(foo(...), ['a']),
+ ),
+);
+
+?>
+--EXPECTF--
+Fatal error: Uncaught Exception: Test in %s:%d
+Stack trace:
+#0 [internal function]: foo('a')
+#1 %s(%d): array_map(Object(Closure), Array)
+#2 {main}
+ thrown in %s on line %d
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
index 0df529203c1b9..5a060540db015 100644
--- a/Zend/zend_execute.c
+++ b/Zend/zend_execute.c
@@ -4104,6 +4104,7 @@ ZEND_API void zend_unfinished_calls_gc(zend_execute_data *execute_data,
zend_exe
case ZEND_DO_ICALL:
case ZEND_DO_UCALL:
case ZEND_DO_FCALL_BY_NAME:
+ case ZEND_CALLABLE_CONVERT:
level++;
break;
case ZEND_INIT_FCALL:
@@ -4159,6 +4160,7 @@ ZEND_API void zend_unfinished_calls_gc(zend_execute_data *execute_data,
zend_exe
case ZEND_DO_ICALL:
case ZEND_DO_UCALL:
case ZEND_DO_FCALL_BY_NAME:
+ case ZEND_CALLABLE_CONVERT:
level++;
break;
case ZEND_INIT_FCALL:
@@ -4237,6 +4239,7 @@ static void cleanup_unfinished_calls(zend_execute_data *execute_data, uint32_t
o
case ZEND_DO_ICALL:
case ZEND_DO_UCALL:
case ZEND_DO_FCALL_BY_NAME:
+ case ZEND_CALLABLE_CONVERT:
level++;
break;
case ZEND_INIT_FCALL:
@@ -4292,6 +4295,7 @@ static void cleanup_unfinished_calls(zend_execute_data *execute_data, uint32_t
o
case ZEND_DO_ICALL:
case ZEND_DO_UCALL:
case ZEND_DO_FCALL_BY_NAME:
+ case ZEND_CALLABLE_CONVERT:
level++;
break;
case ZEND_INIT_FCALL: