mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-15 15:58:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.2.4679: cannot have expandcmd() give an error message for mistakes

Browse Source 
Problem:    Cannot have expandcmd() give an error message for mistakes.
Solution:   Add an optional argument to give errors. Fix memory leak when
            expanding files fails. (Yegappan Lakshmanan, closes vim/vim#10071)
2b74b6805b

Co-authored-by: Yegappan Lakshmanan <yegappan@yahoo.com>
This commit is contained in:
zeertzjq
2022-10-22 09:32:01 +08:00
parent 781616bee5
commit 8e868d699a
5 changed files with 48 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/nvim/eval/funcs.c
View File

@@ -2058,6 +2058,12 @@ static void f_menu_get(typval_T *argvars, typval_T *rettv, EvalFuncData fptr)
static void f_expandcmd(typval_T *argvars, typval_T *rettv, EvalFuncData fptr)
{
char *errormsg = NULL;
bool emsgoff = true;
if (argvars[1].v_type == VAR_DICT
&& tv_dict_get_bool(argvars[1].vval.v_dict, "errmsg", kBoolVarFalse)) {
emsgoff = false;
}
rettv->v_type = VAR_STRING;
char *cmdstr = xstrdup(tv_get_string(&argvars[0]));
@@ -2071,9 +2077,17 @@ static void f_expandcmd(typval_T *argvars, typval_T *rettv, EvalFuncData fptr)
};
eap.argt |= EX_NOSPC;
emsg_off++;
expand_filename(&eap, &cmdstr, &errormsg);
emsg_off--;
if (emsgoff) {
emsg_off++;
}
if (expand_filename(&eap, &cmdstr, &errormsg) == FAIL) {
if (!emsgoff && errormsg != NULL && *errormsg != NUL) {
emsg(errormsg);
}
}
if (emsgoff) {
emsg_off--;
}
rettv->vval.v_string = cmdstr;
}