mirror of
https://github.com/vim/vim.git
synced 2025-09-23 03:43:49 -04:00
patch 7.4.1233
Problem: Channel command may cause a crash. Solution: Check for NULL argument. (Damien)
This commit is contained in:
@@ -629,6 +629,8 @@ channel_exe_cmd(int idx, char_u *cmd, typval_T *arg2, typval_T *arg3)
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
arg = arg2->vval.v_string;
|
arg = arg2->vval.v_string;
|
||||||
|
if (arg == NULL)
|
||||||
|
arg = (char_u *)"";
|
||||||
|
|
||||||
if (STRCMP(cmd, "ex") == 0)
|
if (STRCMP(cmd, "ex") == 0)
|
||||||
{
|
{
|
||||||
@@ -647,7 +649,7 @@ channel_exe_cmd(int idx, char_u *cmd, typval_T *arg2, typval_T *arg3)
|
|||||||
{
|
{
|
||||||
exarg_T ea;
|
exarg_T ea;
|
||||||
|
|
||||||
ea.forceit = arg != NULL && *arg != NUL;
|
ea.forceit = *arg != NUL;
|
||||||
ex_redraw(&ea);
|
ex_redraw(&ea);
|
||||||
showruler(FALSE);
|
showruler(FALSE);
|
||||||
setcursor();
|
setcursor();
|
||||||
|
@@ -742,6 +742,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 */
|
||||||
|
/**/
|
||||||
|
1233,
|
||||||
/**/
|
/**/
|
||||||
1232,
|
1232,
|
||||||
/**/
|
/**/
|
||||||
|
Reference in New Issue
Block a user