patch 8.2.4716: memory allocation failure not tested when defining a function
Problem: Memory allocation failure not tested when defining a function.
Solution: Add a test. (Yegappan Lakshmanan, closes #10127)
diff --git a/src/alloc.c b/src/alloc.c
index 9547d67..5218d00 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -719,6 +719,20 @@
return OK;
}
+/*
+ * Same as ga_grow() but uses an allocation id for testing.
+ */
+ int
+ga_grow_id(garray_T *gap, int n, alloc_id_T id UNUSED)
+{
+#ifdef FEAT_EVAL
+ if (alloc_fail_id == id && alloc_does_fail(sizeof(list_T)))
+ return FAIL;
+#endif
+
+ return ga_grow(gap, n);
+}
+
int
ga_grow_inner(garray_T *gap, int n)
{
diff --git a/src/alloc.h b/src/alloc.h
index 58ae25c..651e01f 100644
--- a/src/alloc.h
+++ b/src/alloc.h
@@ -44,5 +44,6 @@
aid_newwin_wvars,
aid_newtabpage_tvars,
aid_blob_alloc,
+ aid_get_func,
aid_last
} alloc_id_T;
diff --git a/src/proto/alloc.pro b/src/proto/alloc.pro
index 18281ad..b605f28 100644
--- a/src/proto/alloc.pro
+++ b/src/proto/alloc.pro
@@ -19,6 +19,7 @@
void ga_init(garray_T *gap);
void ga_init2(garray_T *gap, size_t itemsize, int growsize);
int ga_grow(garray_T *gap, int n);
+int ga_grow_id(garray_T *gap, int n, alloc_id_T id UNUSED);
int ga_grow_inner(garray_T *gap, int n);
char_u *ga_concat_strings(garray_T *gap, char *sep);
int ga_copy_string(garray_T *gap, char_u *p);
diff --git a/src/testdir/test_user_func.vim b/src/testdir/test_user_func.vim
index 6eb8a0f..f6e25e3 100644
--- a/src/testdir/test_user_func.vim
+++ b/src/testdir/test_user_func.vim
@@ -499,4 +499,34 @@
bwipe!
endfunc
+" Test for memory allocation failure when defining a new function
+func Test_funcdef_alloc_failure()
+ new
+ let lines =<< trim END
+ func Xtestfunc()
+ return 321
+ endfunc
+ END
+ call setline(1, lines)
+ call test_alloc_fail(GetAllocId('get_func'), 0, 0)
+ call assert_fails('source', 'E342:')
+ call assert_false(exists('*Xtestfunc'))
+ call assert_fails('delfunc Xtestfunc', 'E117:')
+ %d _
+ let lines =<< trim END
+ def g:Xvim9func(): number
+ return 456
+ enddef
+ END
+ call setline(1, lines)
+ call test_alloc_fail(GetAllocId('get_func'), 0, 0)
+ call assert_fails('source', 'E342:')
+ call assert_false(exists('*Xvim9func'))
+ "call test_alloc_fail(GetAllocId('get_func'), 0, 0)
+ "call assert_fails('source', 'E342:')
+ "call assert_false(exists('*Xtestfunc'))
+ "call assert_fails('delfunc Xtestfunc', 'E117:')
+ bw!
+endfunc
+
" vim: shiftwidth=2 sts=2 expandtab
diff --git a/src/testdir/test_vim9_func.vim b/src/testdir/test_vim9_func.vim
index 06168e4..9287ed5 100644
--- a/src/testdir/test_vim9_func.vim
+++ b/src/testdir/test_vim9_func.vim
@@ -4071,6 +4071,22 @@
v9.CheckScriptFailure(lines, 'E476:')
enddef
+" Test for memory allocation failure when defining a new lambda
+func Test_lambda_allocation_failure()
+ new
+ let lines =<< trim END
+ vim9script
+ g:Xlambda = (x): number => {
+ return x + 1
+ }
+ END
+ call setline(1, lines)
+ call test_alloc_fail(GetAllocId('get_func'), 0, 0)
+ call assert_fails('source', 'E342:')
+ call assert_false(exists('g:Xlambda'))
+ bw!
+endfunc
+
" The following messes up syntax highlight, keep near the end.
if has('python3')
def Test_python3_command()
diff --git a/src/userfunc.c b/src/userfunc.c
index c80a490..7ad3388 100644
--- a/src/userfunc.c
+++ b/src/userfunc.c
@@ -1092,7 +1092,7 @@
}
// Add the line to the function.
- if (ga_grow(newlines, 1 + sourcing_lnum_off) == FAIL)
+ if (ga_grow_id(newlines, 1 + sourcing_lnum_off, aid_get_func) == FAIL)
goto theend;
if (heredoc_concat_len > 0)
diff --git a/src/version.c b/src/version.c
index 5ffcdeb..f8f15ad 100644
--- a/src/version.c
+++ b/src/version.c
@@ -747,6 +747,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 4716,
+/**/
4715,
/**/
4714,