From 601ab6e9d0cdd52a7b86819ae2e604936e83f648 Mon Sep 17 00:00:00 2001 From: Bob Weinand Date: Sun, 16 Oct 2016 12:34:10 +0200 Subject: Fix searching for catch blocks Since PHP-7.1 catch blocks are addressed with relative byte difference between two catch blocks as opposed to absolute opcode number --- sapi/phpdbg/phpdbg_utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sapi/phpdbg/phpdbg_utils.c') diff --git a/sapi/phpdbg/phpdbg_utils.c b/sapi/phpdbg/phpdbg_utils.c index 331409990e..642c1dec63 100644 --- a/sapi/phpdbg/phpdbg_utils.c +++ b/sapi/phpdbg/phpdbg_utils.c @@ -772,7 +772,7 @@ PHPDBG_API zend_bool phpdbg_check_caught_ex(zend_execute_data *execute_data, zen return 1; } - catch = cur->extended_value; + catch += cur->extended_value / sizeof(zend_op); } while (!cur->result.num); return 0; -- cgit v1.2.1