0
0
mirror of https://github.com/vim/vim.git synced 2025-09-25 03:54:15 -04:00

patch 9.0.0864: crash when using "!!" without a previous shell command

Problem:    Crash when using "!!" without a previous shell command.
Solution:   Check "prevcmd" is not NULL. (closes #11487)
This commit is contained in:
Bram Moolenaar
2022-11-12 16:36:35 +00:00
parent 4c8d2f02b3
commit 6600447c7b
3 changed files with 36 additions and 2 deletions

View File

@@ -858,6 +858,21 @@ free_prev_shellcmd(void)
} }
#endif #endif
/*
* Check that "prevcmd" is not NULL. If it is NULL then give an error message
* and return FALSE.
*/
static int
prevcmd_is_set(void)
{
if (prevcmd == NULL)
{
emsg(_(e_no_previous_command));
return FALSE;
}
return TRUE;
}
/* /*
* Handle the ":!cmd" command. Also for ":r !cmd" and ":w !cmd" * Handle the ":!cmd" command. Also for ":r !cmd" and ":w !cmd"
* Bangs in the argument are replaced with the previously entered command. * Bangs in the argument are replaced with the previously entered command.
@@ -913,9 +928,8 @@ do_bang(
len += (int)STRLEN(newcmd); len += (int)STRLEN(newcmd);
if (ins_prevcmd) if (ins_prevcmd)
{ {
if (prevcmd == NULL) if (!prevcmd_is_set())
{ {
emsg(_(e_no_previous_command));
vim_free(newcmd); vim_free(newcmd);
return; return;
} }
@@ -971,6 +985,9 @@ do_bang(
if (bangredo) // put cmd in redo buffer for ! command if (bangredo) // put cmd in redo buffer for ! command
{ {
if (!prevcmd_is_set())
goto theend;
// If % or # appears in the command, it must have been escaped. // If % or # appears in the command, it must have been escaped.
// Reescape them, so that redoing them does not substitute them by the // Reescape them, so that redoing them does not substitute them by the
// buffername. // buffername.
@@ -1020,6 +1037,8 @@ do_bang(
do_filter(line1, line2, eap, newcmd, do_in, do_out); do_filter(line1, line2, eap, newcmd, do_in, do_out);
apply_autocmds(EVENT_SHELLFILTERPOST, NULL, NULL, FALSE, curbuf); apply_autocmds(EVENT_SHELLFILTERPOST, NULL, NULL, FALSE, curbuf);
} }
theend:
if (free_newcmd) if (free_newcmd)
vim_free(newcmd); vim_free(newcmd);
} }

View File

@@ -282,4 +282,17 @@ func Test_shell_repeat()
let &shell = save_shell let &shell = save_shell
endfunc endfunc
func Test_shell_no_prevcmd()
" this doesn't do anything, just check it doesn't crash
let after =<< trim END
exe "normal !!\<CR>"
call writefile([v:errmsg, 'done'], 'Xtestdone')
qall!
END
if RunVim([], after, '--clean')
call assert_equal(['E34: No previous command', 'done'], readfile('Xtestdone'))
endif
call delete('Xtestdone')
endfunc
" vim: shiftwidth=2 sts=2 expandtab " vim: shiftwidth=2 sts=2 expandtab

View File

@@ -695,6 +695,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
864,
/**/ /**/
863, 863,
/**/ /**/