diff options
| author | Bram Moolenaar <Bram@vim.org> | 2018-03-20 11:41:44 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2018-03-20 11:41:44 +0100 |
| commit | 81c3c89a28859de3aa167c53355f374394ada093 (patch) | |
| tree | 2dea122ebbe46ffc5b9d904bbd4e4661b83e61c9 | |
| parent | ecadf4377f120200252e023ef6a9aa369e98850a (diff) | |
| download | vim-git-81c3c89a28859de3aa167c53355f374394ada093.tar.gz | |
patch 8.0.1619: Win32 GUI: crash when winpty is not installedv8.0.1619
Problem: Win32 GUI: crash when winpty is not installed and trying to use
:shell in a terminal window.
Solution: Check for NULL return form term_start(). (Yasuhiro Matsumoto,
closes #2727)
| -rw-r--r-- | src/os_win32.c | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/os_win32.c b/src/os_win32.c index b70a0025d..0cb311337 100644 --- a/src/os_win32.c +++ b/src/os_win32.c @@ -4824,6 +4824,8 @@ mch_call_shell_terminal( argvar[0].vval.v_string = newcmd; argvar[1].v_type = VAR_UNKNOWN; buf = term_start(argvar, NULL, &opt, TERM_START_SYSTEM); + if (buf == NULL) + return 255; /* Find a window to make "buf" curbuf. */ aucmd_prepbuf(&aco, buf); diff --git a/src/version.c b/src/version.c index 35feb7698..6ac9000db 100644 --- a/src/version.c +++ b/src/version.c @@ -767,6 +767,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1619, +/**/ 1618, /**/ 1617, |