Mercurial > vim
diff src/userfunc.c @ 28006:02f787034998 v8.2.4528
patch 8.2.4528: crash when using null_function for a partial
Commit: https://github.com/vim/vim/commit/673bcb10ebe87ccf6954dd342d0143eb88cdfbcb
Author: Bram Moolenaar <Bram@vim.org>
Date: Tue Mar 8 16:52:24 2022 +0000
patch 8.2.4528: crash when using null_function for a partial
Problem: Crash when using null_function for a partial.
Solution: Don't call fname_trans_sid() with NULL. (closes https://github.com/vim/vim/issues/9908)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Tue, 08 Mar 2022 18:00:04 +0100 |
| parents | 442ca2007bec |
| children | cc7d54a134e4 |
line wrap: on
line diff
--- a/src/userfunc.c +++ b/src/userfunc.c @@ -5730,7 +5730,6 @@ func_has_abort( make_partial(dict_T *selfdict_in, typval_T *rettv) { char_u *fname; - char_u *tofree = NULL; ufunc_T *fp; char_u fname_buf[FLEN_FIXED + 1]; int error; @@ -5742,13 +5741,19 @@ make_partial(dict_T *selfdict_in, typval { fname = rettv->v_type == VAR_FUNC ? rettv->vval.v_string : rettv->vval.v_partial->pt_name; - // Translate "s:func" to the stored function name. - fname = fname_trans_sid(fname, fname_buf, &tofree, &error); - fp = find_func(fname, FALSE); - vim_free(tofree); - } - - if (fp != NULL && (fp->uf_flags & FC_DICT)) + if (fname != NULL) + { + char_u *tofree = NULL; + + // Translate "s:func" to the stored function name. + fname = fname_trans_sid(fname, fname_buf, &tofree, &error); + fp = find_func(fname, FALSE); + vim_free(tofree); + } + } + + if ((fp != NULL && (fp->uf_flags & FC_DICT)) + || (rettv->v_type == VAR_FUNC && rettv->vval.v_string == NULL)) { partial_T *pt = ALLOC_CLEAR_ONE(partial_T);