Mercurial > vim
changeset 28382:f24d4826e6bf v8.2.4716
patch 8.2.4716: memory allocation failure not tested when defining a function
Commit: https://github.com/vim/vim/commit/7c7e19cf50d76568e2637ad66b095044a41c6a82
Author: Yegappan Lakshmanan <yegappan@yahoo.com>
Date: Sat Apr 9 11:09:07 2022 +0100
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 https://github.com/vim/vim/issues/10127)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sat, 09 Apr 2022 12:15:02 +0200 |
| parents | ddc656bfc2b9 |
| children | 551872cfcf97 |
| files | src/alloc.c src/alloc.h src/proto/alloc.pro src/testdir/test_user_func.vim src/testdir/test_vim9_func.vim src/userfunc.c src/version.c |
| diffstat | 7 files changed, 65 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/alloc.c +++ b/src/alloc.c @@ -719,6 +719,20 @@ ga_grow(garray_T *gap, int n) 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) {
--- a/src/alloc.h +++ b/src/alloc.h @@ -44,5 +44,6 @@ typedef enum { aid_newwin_wvars, aid_newtabpage_tvars, aid_blob_alloc, + aid_get_func, aid_last } alloc_id_T;
--- a/src/proto/alloc.pro +++ b/src/proto/alloc.pro @@ -19,6 +19,7 @@ int ga_copy_strings(garray_T *from, garr 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);
--- a/src/testdir/test_user_func.vim +++ b/src/testdir/test_user_func.vim @@ -499,4 +499,34 @@ func Test_func_range() 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
--- a/src/testdir/test_vim9_func.vim +++ b/src/testdir/test_vim9_func.vim @@ -4071,6 +4071,22 @@ def Test_go_beyond_end_of_cmd() 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()