diff options
| author | Bob Weinand <bobwei9@hotmail.com> | 2015-04-22 01:07:52 +0200 |
|---|---|---|
| committer | Bob Weinand <bobwei9@hotmail.com> | 2015-04-22 01:08:08 +0200 |
| commit | e09a0bfc9e849b558fb03be33ac463ef3288305b (patch) | |
| tree | 5fc1c271e135dfe9a49e819760de6c424b67b6af /sapi/phpdbg/phpdbg_prompt.c | |
| parent | 73d31d44e8b59804077b4f6451e06caf69166a6b (diff) | |
| download | php-git-e09a0bfc9e849b558fb03be33ac463ef3288305b.tar.gz | |
Also consider specific catches when checking for uncaught
Diffstat (limited to 'sapi/phpdbg/phpdbg_prompt.c')
| -rw-r--r-- | sapi/phpdbg/phpdbg_prompt.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sapi/phpdbg/phpdbg_prompt.c b/sapi/phpdbg/phpdbg_prompt.c index 11af5bc790..e2978fb5c7 100644 --- a/sapi/phpdbg/phpdbg_prompt.c +++ b/sapi/phpdbg/phpdbg_prompt.c @@ -1446,12 +1446,12 @@ void phpdbg_execute_ex(zend_execute_data *execute_data) /* {{{ */ continue; } - if (phpdbg_check_caught_ex(prev_ex)) { + if (phpdbg_check_caught_ex(prev_ex, exception)) { goto ex_is_caught; } } while ((prev_ex = prev_ex->prev_execute_data)); - PHPDBG_G(handled_exception) = EG(exception); + PHPDBG_G(handled_exception) = exception; phpdbg_error("exception", "name=\"%s\"", "Uncaught exception %s", exception->ce->name->val); DO_INTERACTIVE(1); } @@ -1474,7 +1474,7 @@ ex_is_caught: goto next; } -#define INDEX_EXISTS_CHECK (zend_hash_index_exists(&PHPDBG_G(seek), address) || (EG(exception) && phpdbg_check_caught_ex(execute_data) == 0)) +#define INDEX_EXISTS_CHECK (zend_hash_index_exists(&PHPDBG_G(seek), address) || (exception && phpdbg_check_caught_ex(execute_data, exception) == 0)) /* run to next line */ if (PHPDBG_G(flags) & PHPDBG_IN_UNTIL) { |