diff options
| author | Bob Weinand <bobwei9@hotmail.com> | 2014-10-25 18:48:43 +0200 |
|---|---|---|
| committer | Bob Weinand <bobwei9@hotmail.com> | 2014-10-25 18:48:43 +0200 |
| commit | bbcee18b4b6d9220d4fdcb0d69a33979a5fa84a4 (patch) | |
| tree | d743c196358ecc82b8b29559d58c534cce506adb /phpdbg_frame.c | |
| parent | be5242e0fedcf23bdf56a4b1a73f8a84c5b216ce (diff) | |
| download | php-git-bbcee18b4b6d9220d4fdcb0d69a33979a5fa84a4.tar.gz | |
Fix phpdbg output when outputting via php with active output handlers
Diffstat (limited to 'phpdbg_frame.c')
| -rw-r--r-- | phpdbg_frame.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/phpdbg_frame.c b/phpdbg_frame.c index df304e3541..437e6d474a 100644 --- a/phpdbg_frame.c +++ b/phpdbg_frame.c @@ -25,6 +25,7 @@ #include "phpdbg_list.h" ZEND_EXTERN_MODULE_GLOBALS(phpdbg); +ZEND_EXTERN_MODULE_GLOBALS(output); void phpdbg_restore_frame(TSRMLS_D) /* {{{ */ { @@ -198,8 +199,12 @@ void phpdbg_dump_backtrace(size_t num TSRMLS_DC) /* {{{ */ int i = 0, limit = num; int user_defined; + PHPDBG_OUTPUT_BACKUP(); + if (limit < 0) { phpdbg_error("backtrace", "type=\"minnum\"", "Invalid backtrace size %d", limit); + + PHPDBG_OUTPUT_BACKUP_RESTORE(); return; } @@ -242,4 +247,6 @@ void phpdbg_dump_backtrace(size_t num TSRMLS_DC) /* {{{ */ phpdbg_xml("</backtrace>"); zval_dtor(&zbacktrace); + + PHPDBG_OUTPUT_BACKUP_RESTORE(); } /* }}} */ |