diff options
| author | Anatol Belski <ab@php.net> | 2015-09-02 22:08:24 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2015-09-02 22:08:24 +0200 |
| commit | 6ef7c6358fc37579d329268cbb56ab730bed2159 (patch) | |
| tree | 2fe3452647d7450c867de9eab62f456ed77a2553 /sapi/phpdbg/phpdbg_prompt.c | |
| parent | b7e910e9696001ae6fa728c10362f657b4b97742 (diff) | |
| parent | fcece2a7bb0ecf1af1034a737bf5686a354e01d7 (diff) | |
| download | php-git-6ef7c6358fc37579d329268cbb56ab730bed2159.tar.gz | |
Merge branch 'master' into PHP-7.0.0
* master: (201 commits)
sync NEWS
Add missing variable from birdstep_commit() which got removed in e8fcd52ef
Align NEWS entries format
Add CVE for #70140 (PHP 7.0.0 Beta 3)
Seems master is not affected
We should keep one refcount to resource
Fixed bug #70398 (SIGSEGV, Segmentation fault zend_ast_destroy_ex)
Fixed test
Partially fix bug #67167 - Wrong return value...
move the phpdbg NEWS entry to the correct version
add missing news entries
Skip if ext/filter isn't loaded
Merge branch 'PHP-5.6'
5.5.30 next
Use ZSTR_VAL
fix dir separators in test
use correct api
fix leak
cleanup an atavism
add overflow check
...
Diffstat (limited to 'sapi/phpdbg/phpdbg_prompt.c')
| -rw-r--r-- | sapi/phpdbg/phpdbg_prompt.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sapi/phpdbg/phpdbg_prompt.c b/sapi/phpdbg/phpdbg_prompt.c index 2001129ec8..41d221f527 100644 --- a/sapi/phpdbg/phpdbg_prompt.c +++ b/sapi/phpdbg/phpdbg_prompt.c @@ -1628,7 +1628,13 @@ void phpdbg_force_interruption(void) /* {{{ */ { if (data) { if (data->func) { - phpdbg_notice("hardinterrupt", "opline=\"%p\" num=\"%lu\" file=\"%s\" line=\"%u\"", "Current opline: %p (op #%lu) in %s:%u", data->opline, (data->opline - data->func->op_array.opcodes) / sizeof(data->opline), data->func->op_array.filename, data->opline->lineno); + if (ZEND_USER_CODE(data->func->type)) { + phpdbg_notice("hardinterrupt", "opline=\"%p\" num=\"%lu\" file=\"%s\" line=\"%u\"", "Current opline: %p (op #%lu) in %s:%u", data->opline, (data->opline - data->func->op_array.opcodes) / sizeof(data->opline), data->func->op_array.filename->val, data->opline->lineno); + } else if (data->func->internal_function.function_name) { + phpdbg_notice("hardinterrupt", "func=\"%s\"", "Current opline: in internal function %s", data->func->internal_function.function_name->val); + } else { + phpdbg_notice("hardinterrupt", "", "Current opline: executing internal code"); + } } else { phpdbg_notice("hardinterrupt", "opline=\"%p\"", "Current opline: %p (op_array information unavailable)", data->opline); } |