diff options
| author | Bob Weinand <bobwei9@hotmail.com> | 2014-10-25 19:09:19 +0200 |
|---|---|---|
| committer | Bob Weinand <bobwei9@hotmail.com> | 2014-10-25 19:09:19 +0200 |
| commit | 044f37a832ec1f72c960b02dc7a5b9aca3f43f67 (patch) | |
| tree | a910460a3bc2312bcf2aa6b81039396c6a46d0e7 /sapi/phpdbg/phpdbg_frame.c | |
| parent | 87c28ccd28121070ba7225f0ad73b9246dcfdc49 (diff) | |
| parent | 24babb01946ccb63b993b98b161455475a697d42 (diff) | |
| download | php-git-044f37a832ec1f72c960b02dc7a5b9aca3f43f67.tar.gz | |
Merge remote-tracking branch 'origin/PHP-5.6'
Conflicts:
sapi/phpdbg/phpdbg.c
sapi/phpdbg/phpdbg_list.c
Diffstat (limited to 'sapi/phpdbg/phpdbg_frame.c')
| -rw-r--r-- | sapi/phpdbg/phpdbg_frame.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/sapi/phpdbg/phpdbg_frame.c b/sapi/phpdbg/phpdbg_frame.c index 4429a7fb73..08a6bec994 100644 --- a/sapi/phpdbg/phpdbg_frame.c +++ b/sapi/phpdbg/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) /* {{{ */ { @@ -174,8 +175,12 @@ void phpdbg_dump_backtrace(size_t num TSRMLS_DC) /* {{{ */ zval *file, *line; int i = 0, limit = num; + PHPDBG_OUTPUT_BACKUP(); + if (limit < 0) { phpdbg_error("backtrace", "type=\"minnum\"", "Invalid backtrace size %d", limit); + + PHPDBG_OUTPUT_BACKUP_RESTORE(); return; } @@ -218,4 +223,6 @@ void phpdbg_dump_backtrace(size_t num TSRMLS_DC) /* {{{ */ phpdbg_xml("</backtrace>"); zval_dtor(&zbacktrace); + + PHPDBG_OUTPUT_BACKUP_RESTORE(); } /* }}} */ |