diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-09-20 17:20:02 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-09-20 17:20:02 +0200 |
| commit | 4d5c12626c98df23e1a5d953692d946310ddfa9c (patch) | |
| tree | e86270474116aff5cb8c16f5b1fdef1e7c587d96 | |
| parent | bffba7f7042f6082e75b42484b15f66087b01941 (diff) | |
patch 8.1.2061: MS-Windows GUI: ":sh" crashes when trying to use a terminalv8.1.2061
Problem: MS-Windows GUI: ":sh" crashes when trying to use a terminal.
Solution: Check for a NULL command. (Yasuhiro Matsumoto, closes #4958)
| -rw-r--r-- | src/os_win32.c | 10 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 8 insertions, 4 deletions
diff --git a/src/os_win32.c b/src/os_win32.c index ae77e40ebc..39b86d6ab6 100644 --- a/src/os_win32.c +++ b/src/os_win32.c @@ -4657,12 +4657,14 @@ mch_call_shell( { char_u *cmdbase = cmd; - // Skip a leading quote and (. - while (*cmdbase == '"' || *cmdbase == '(') - ++cmdbase; + if (cmdbase != NULL) + // Skip a leading quote and (. + while (*cmdbase == '"' || *cmdbase == '(') + ++cmdbase; // Check the command does not begin with "start " - if (STRNICMP(cmdbase, "start", 5) != 0 || !VIM_ISWHITE(cmdbase[5])) + if (cmdbase == NULL + || STRNICMP(cmdbase, "start", 5) != 0 || !VIM_ISWHITE(cmdbase[5])) { // Use a terminal window to run the command in. x = mch_call_shell_terminal(cmd, options); diff --git a/src/version.c b/src/version.c index 76873d7623..59a2bb4692 100644 --- a/src/version.c +++ b/src/version.c @@ -758,6 +758,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2061, +/**/ 2060, /**/ 2059, |