Commit 10bdc08bf04 for php.net

commit 10bdc08bf04a9f1c21fd5f1785ac5ee11ed3164a
Merge: 3642a7acbef 2ec5f2d994b
Author: Tim Düsterhus <tim@bastelstu.be>
Date:   Sun Jun 14 15:13:58 2026 +0200

    Merge branch 'PHP-8.5'

    * PHP-8.5:
      Fix GH-22280: Ignore non-finally try blocks (#22286)

diff --cc Zend/zend_opcode.c
index 0c6b2247351,4a3fc783fa9..538eff3ea34
--- a/Zend/zend_opcode.c
+++ b/Zend/zend_opcode.c
@@@ -697,7 -686,13 +697,11 @@@ static void zend_extension_op_array_han

  static void zend_check_finally_breakout(zend_op_array *op_array, uint32_t op_num, uint32_t dst_num)
  {
 -	int i;
 -
 -	for (i = 0; i < op_array->last_try_catch; i++) {
 +	for (uint32_t i = 0; i < op_array->last_try_catch; i++) {
+ 		if (!op_array->try_catch_array[i].finally_op) {
+ 			continue;
+ 		}
+
  		if ((op_num < op_array->try_catch_array[i].finally_op ||
  					op_num >= op_array->try_catch_array[i].finally_end)
  				&& (dst_num >= op_array->try_catch_array[i].finally_op &&