diff --git a/src/os_win32.c b/src/os_win32.c index ae77e40eb..39b86d6ab 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 76873d762..59a2bb469 100644 --- a/src/version.c +++ b/src/version.c @@ -757,6 +757,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 2061, /**/ 2060, /**/