IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

eval: Exit early if argument is invalid.

Browse Source
This commit is contained in:
Jurica Bradaric 2016-08-28 13:42:18 +02:00
parent 50bd8297e6
commit 61024fb4a8
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/nvim/eval.c
View File

@ -7713,10 +7713,20 @@ static void f_bufnr(typval_T *argvars, typval_T *rettv, FunPtr fptr)
static void buf_win_common(typval_T *argvars, typval_T *rettv, bool get_nr) static void buf_win_common(typval_T *argvars, typval_T *rettv, bool get_nr)
{ {
(void)get_tv_number(&argvars[0]); // issue errmsg if type error int error = false;
emsg_off++; (void)get_tv_number_chk(&argvars[0], &error); // issue errmsg if type error
if (error) { // the argument has an invalid type
rettv->vval.v_number = -1;
return;
}
emsg_off++;
buf_T *buf = get_buf_tv(&argvars[0], true);
if (buf == NULL) { // no need to search if buffer was not found
rettv->vval.v_number = -1;
goto end;
}
buf_T *buf = get_buf_tv(&argvars[0], TRUE);
int winnr = 0; int winnr = 0;
int winid; int winid;
bool found_buf = false; bool found_buf = false;
@ -7729,6 +7739,7 @@ static void buf_win_common(typval_T *argvars, typval_T *rettv, bool get_nr)
} }
} }
rettv->vval.v_number = (found_buf ? (get_nr ? winnr : winid) : -1); rettv->vval.v_number = (found_buf ? (get_nr ? winnr : winid) : -1);
end:
emsg_off--; emsg_off--;
} }