diff options
| author | Bram Moolenaar <Bram@vim.org> | 2022-12-27 17:25:05 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2022-12-27 17:25:05 +0000 |
| commit | 56310d38d8e866085108c7b77b756f4373d5122a (patch) | |
| tree | 1976b6a184bd84128c0caee19358e09efafa65e4 | |
| parent | b9a1edfc5434f2a3ac50b1a178d3c85aa417b798 (diff) | |
patch 9.0.1104: invalid memory access when checking function argument typesv9.0.1104
Problem: Invalid memory access when checking function argument types.
Solution: Do not check beyond the number of arguments. (closes #11755)
| -rw-r--r-- | src/testdir/test_vim9_func.vim | 10 | ||||
| -rw-r--r-- | src/version.c | 2 | ||||
| -rw-r--r-- | src/vim9type.c | 2 |
3 files changed, 13 insertions, 1 deletions
diff --git a/src/testdir/test_vim9_func.vim b/src/testdir/test_vim9_func.vim index a5e3e90254..0edf7eab71 100644 --- a/src/testdir/test_vim9_func.vim +++ b/src/testdir/test_vim9_func.vim @@ -426,6 +426,16 @@ def Test_check_argument_type() Func() END v9.CheckScriptFailure(lines, 'E1013: Argument 2: type mismatch, expected number but got bool', 2) + + lines =<< trim END + vim9script + + def Foobar(Fn: func(any, ?string): any) + enddef + + Foobar((t) => 0) + END + v9.CheckScriptSuccess(lines) enddef def Test_missing_return() diff --git a/src/version.c b/src/version.c index b33f6d5a88..8dbf11f89d 100644 --- a/src/version.c +++ b/src/version.c @@ -696,6 +696,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1104, +/**/ 1103, /**/ 1102, diff --git a/src/vim9type.c b/src/vim9type.c index 0709ce0437..393c69d7e7 100644 --- a/src/vim9type.c +++ b/src/vim9type.c @@ -848,7 +848,7 @@ check_type_maybe( { int i; - for (i = 0; i < expected->tt_argcount; ++i) + for (i = 0; i < expected->tt_argcount && i < actual->tt_argcount; ++i) // Allow for using "any" argument type, lambda's have them. if (actual->tt_args[i] != &t_any && check_type( expected->tt_args[i], actual->tt_args[i], FALSE, |