Mercurial > vim
diff src/vim9type.c @ 26833:434eaef2ac62 v8.2.3945
patch 8.2.3945: Vim9: partial variable argument types are wrong
Commit: https://github.com/vim/vim/commit/13789bf10338a0d049c78acfdc0870fc63e63f4f
Author: Bram Moolenaar <Bram@vim.org>
Date: Thu Dec 30 13:29:00 2021 +0000
patch 8.2.3945: Vim9: partial variable argument types are wrong
Problem: Vim9: partial variable argument types are wrong, leading to a
crash.
Solution: When adjusting the argument count also adjust the argument types.
(closes #9433)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Thu, 30 Dec 2021 14:30:04 +0100 |
| parents | 1b288eb2fcdc |
| children | eb6d56ab4858 |
line wrap: on
line diff
--- a/src/vim9type.c +++ b/src/vim9type.c @@ -371,6 +371,18 @@ typval2type_int(typval_T *tv, int copyID *type = *ufunc->uf_func_type; type->tt_argcount -= tv->vval.v_partial->pt_argc; type->tt_min_argcount -= tv->vval.v_partial->pt_argc; + if (type->tt_argcount == 0) + type->tt_args = NULL; + else + { + int i; + + func_type_add_arg_types(type, type->tt_argcount, + type_gap); + for (i = 0; i < type->tt_argcount; ++i) + type->tt_args[i] = ufunc->uf_func_type->tt_args[ + i + tv->vval.v_partial->pt_argc]; + } return type; } return ufunc->uf_func_type; @@ -464,6 +476,9 @@ check_typval_type(type_T *expected, typv type_T *actual_type; int res = FAIL; + if (expected == NULL) + return OK; // didn't expect anything. + // For some values there is no type, assume an error will be given later // for an invalid value. if ((actual_tv->v_type == VAR_FUNC && actual_tv->vval.v_string == NULL)