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

patch 8.2.4529: Vim9: comparing partial with function fails

Browse Source 
Problem:    Vim9: comparing partial with function fails.
Solution:   Support this comparison.  Avoid a crash. (closes #9909)
            Add more test cases.
This commit is contained in:
Bram Moolenaar
2022-03-08 19:43:55 +00:00
parent 673bcb10eb
commit ed0c62e7b1
8 changed files with 64 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/userfunc.c
View File

@@ -5730,18 +5730,27 @@ func_has_abort(
make_partial(dict_T *selfdict_in, typval_T *rettv)
{
char_u *fname;
ufunc_T *fp;
ufunc_T *fp = NULL;
char_u fname_buf[FLEN_FIXED + 1];
int error;
dict_T *selfdict = selfdict_in;
if (rettv->v_type == VAR_PARTIAL && rettv->vval.v_partial->pt_func != NULL)
if (rettv->v_type == VAR_PARTIAL && rettv->vval.v_partial != NULL
&& rettv->vval.v_partial->pt_func != NULL)
fp = rettv->vval.v_partial->pt_func;
else
{
fname = rettv->v_type == VAR_FUNC ? rettv->vval.v_string
: rettv->vval.v_partial == NULL ? NULL
: rettv->vval.v_partial->pt_name;
if (fname != NULL)
if (fname == NULL)
{
// There is no point binding a dict to a NULL function, just create
// a function reference.
rettv->v_type = VAR_FUNC;
rettv->vval.v_string = NULL;
}
else
{
char_u *tofree = NULL;
@@ -5752,8 +5761,7 @@ make_partial(dict_T *selfdict_in, typval_T *rettv)
}
}
if ((fp != NULL && (fp->uf_flags & FC_DICT))
|| (rettv->v_type == VAR_FUNC && rettv->vval.v_string == NULL))
if (fp != NULL && (fp->uf_flags & FC_DICT))
{
partial_T *pt = ALLOC_CLEAR_ONE(partial_T);