thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 7.4.1255

Browse Source 
Problem:    Crash for channel "eval" command without third argument.
Solution:   Check for missing argument.
This commit is contained in:
Bram Moolenaar
2016-02-03 23:59:43 +01:00
parent 3b05b135e3
commit 66624ff0d9
4 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/channel.c
View File

@@ -694,7 +694,7 @@ channel_exe_cmd(int idx, char_u *cmd, typval_T *arg2, typval_T *arg3)
{
int is_eval = cmd[1] == 'v';
if (is_eval && arg3->v_type != VAR_NUMBER)
if (is_eval && (arg3 == NULL || arg3->v_type != VAR_NUMBER))
{
if (p_verbose > 2)
EMSG("E904: third argument for eval must be a number");
@@ -774,7 +774,7 @@ may_invoke_callback(int idx)
typval_T *arg3 = NULL;
char_u *cmd = typetv->vval.v_string;
/* ["cmd", arg] */
/* ["cmd", arg] or ["cmd", arg, arg] */
if (list->lv_len == 3)
arg3 = &list->lv_last->li_tv;
channel_exe_cmd(idx, cmd, &argv[1], arg3);