diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2020-05-26 17:46:56 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2020-05-26 17:46:56 +0200 |
| commit | d2508ef94704b10332e2af2ed0c09d0012cffd69 (patch) | |
| tree | dbd8a1d5057d383b407e38dc0f963d10de2cbe9f /sapi/phpdbg/phpdbg_utils.c | |
| parent | 31e410e0980e5c9272c4e4d00ef99c6b50fe0499 (diff) | |
| parent | 9fad9addb5707efe96dc5b9eeea4e4f00816d1f6 (diff) | |
| download | php-git-d2508ef94704b10332e2af2ed0c09d0012cffd69.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
Enable phpdbg tests on AppVeyor
Make phpdbg test portable
Fix several mostly Windows related phpdbg bugs
Fix #73926: phpdbg will not accept input on restart execution
Diffstat (limited to 'sapi/phpdbg/phpdbg_utils.c')
| -rw-r--r-- | sapi/phpdbg/phpdbg_utils.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sapi/phpdbg/phpdbg_utils.c b/sapi/phpdbg/phpdbg_utils.c index 548c9e96b1..699f45b76d 100644 --- a/sapi/phpdbg/phpdbg_utils.c +++ b/sapi/phpdbg/phpdbg_utils.c @@ -355,8 +355,11 @@ PHPDBG_API int phpdbg_get_terminal_height(void) /* {{{ */ #ifdef _WIN32 CONSOLE_SCREEN_BUFFER_INFO csbi; - GetConsoleScreenBufferInfo(GetStdHandle(STD_OUTPUT_HANDLE), &csbi); - lines = csbi.srWindow.Bottom - csbi.srWindow.Top + 1; + if (GetConsoleScreenBufferInfo(GetStdHandle(STD_OUTPUT_HANDLE), &csbi)) { + lines = csbi.srWindow.Bottom - csbi.srWindow.Top + 1; + } else { + lines = 40; + } #elif defined(HAVE_SYS_IOCTL_H) && defined(TIOCGWINSZ) struct winsize w; |