patch 8.2.2505: Vim9: crash after defining function with invalid return type
Problem: Vim9: crash after defining function with invalid return type.
Solution: Clear function growarrays. Fix memory leak.
diff --git a/src/testdir/test_vim9_func.vim b/src/testdir/test_vim9_func.vim
index cea25a4..4bcd974 100644
--- a/src/testdir/test_vim9_func.vim
+++ b/src/testdir/test_vim9_func.vim
@@ -254,6 +254,21 @@
defcompile
END
CheckScriptFailure(lines, 'E1010:', 2)
+
+ lines =<< trim END
+ vim9script
+ def Test(Fun: func(number): number): list<number>
+ return map([1, 2, 3], (_, i) => Fun(i))
+ enddef
+ defcompile
+ def Inc(nr: number): nr
+ return nr + 2
+ enddef
+ echo Test(Inc)
+ END
+ # doing this twice was leaking memory
+ CheckScriptFailure(lines, 'E1010:')
+ CheckScriptFailure(lines, 'E1010:')
enddef
func Increment()
diff --git a/src/userfunc.c b/src/userfunc.c
index c9b15fd..3e17621 100644
--- a/src/userfunc.c
+++ b/src/userfunc.c
@@ -3955,8 +3955,15 @@
erret:
ga_clear_strings(&newargs);
ga_clear_strings(&default_args);
+ if (fp != NULL)
+ {
+ ga_init(&fp->uf_args);
+ ga_init(&fp->uf_def_args);
+ }
errret_2:
ga_clear_strings(&newlines);
+ if (fp != NULL)
+ VIM_CLEAR(fp->uf_arg_types);
ret_free:
ga_clear_strings(&argtypes);
vim_free(skip_until);
diff --git a/src/version.c b/src/version.c
index 465b5b0..6ec23a9 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2505,
+/**/
2504,
/**/
2503,