Patch 8.2.4670
Problem: Memory allocation failures for new tab page not tested.
Solution: Add tests with failing memory allocation. (Yegappan Lakshmanan,
closes #10067)
Files: src/alloc.h, src/blob.c, src/buffer.c, src/window.c,
src/testdir/test_blob.vim, src/testdir/test_buffer.vim,
src/testdir/test_tabpage.vim, src/testdir/test_window_cmd.vim
*** ../vim-8.2.4669/src/alloc.h 2022-04-02 21:46:14.989612828 +0100
--- src/alloc.h 2022-04-03 11:14:32.028202466 +0100
***************
*** 40,45 ****
aid_sign_getplaced_list,
aid_insert_sign,
aid_sign_getinfo,
! aid_buflistnew_bvars,
aid_last
} alloc_id_T;
--- 40,48 ----
aid_sign_getplaced_list,
aid_insert_sign,
aid_sign_getinfo,
! aid_newbuf_bvars,
! aid_newwin_wvars,
! aid_newtabpage_tvars,
! aid_blob_alloc,
aid_last
} alloc_id_T;
*** ../vim-8.2.4669/src/blob.c 2022-01-28 15:28:00.200927841 +0000
--- src/blob.c 2022-04-03 11:14:32.028202466 +0100
***************
*** 22,28 ****
blob_T *
blob_alloc(void)
{
! blob_T *blob = ALLOC_CLEAR_ONE(blob_T);
if (blob != NULL)
ga_init2(&blob->bv_ga, 1, 100);
--- 22,28 ----
blob_T *
blob_alloc(void)
{
! blob_T *blob = ALLOC_CLEAR_ONE_ID(blob_T, aid_blob_alloc);
if (blob != NULL)
ga_init2(&blob->bv_ga, 1, 100);
*** ../vim-8.2.4669/src/buffer.c 2022-04-02 21:46:14.989612828 +0100
--- src/buffer.c 2022-04-03 11:14:32.028202466 +0100
***************
*** 2093,2099 ****
}
#ifdef FEAT_EVAL
// init b: variables
! buf->b_vars = dict_alloc_id(aid_buflistnew_bvars);
if (buf->b_vars == NULL)
{
vim_free(ffname);
--- 2093,2099 ----
}
#ifdef FEAT_EVAL
// init b: variables
! buf->b_vars = dict_alloc_id(aid_newbuf_bvars);
if (buf->b_vars == NULL)
{
vim_free(ffname);
*** ../vim-8.2.4669/src/window.c 2022-04-02 21:46:14.989612828 +0100
--- src/window.c 2022-04-03 11:14:32.028202466 +0100
***************
*** 3801,3806 ****
--- 3801,3808 ----
win_alloc_firstwin(win_T *oldwin)
{
curwin = win_alloc(NULL, FALSE);
+ if (curwin == NULL)
+ return FAIL;
if (oldwin == NULL)
{
// Very first window, need to create an empty buffer for it and
***************
*** 3882,3888 ****
# ifdef FEAT_EVAL
// init t: variables
! tp->tp_vars = dict_alloc();
if (tp->tp_vars == NULL)
{
vim_free(tp);
--- 3884,3890 ----
# ifdef FEAT_EVAL
// init t: variables
! tp->tp_vars = dict_alloc_id(aid_newtabpage_tvars);
if (tp->tp_vars == NULL)
{
vim_free(tp);
***************
*** 5020,5026 ****
#ifdef FEAT_EVAL
// init w: variables
! new_wp->w_vars = dict_alloc();
if (new_wp->w_vars == NULL)
{
win_free_lsize(new_wp);
--- 5022,5028 ----
#ifdef FEAT_EVAL
// init w: variables
! new_wp->w_vars = dict_alloc_id(aid_newwin_wvars);
if (new_wp->w_vars == NULL)
{
win_free_lsize(new_wp);
*** ../vim-8.2.4669/src/testdir/test_blob.vim 2022-01-29 21:45:30.481921547
+0000
--- src/testdir/test_blob.vim 2022-04-03 11:14:32.028202466 +0100
***************
*** 702,705 ****
--- 702,744 ----
call assert_equal(v, string(b))
endfunc
+ " Test for blob allocation failure
+ func Test_blob_alloc_failure()
+ " blob variable
+ call test_alloc_fail(GetAllocId('blob_alloc'), 0, 0)
+ call assert_fails('let v = 0z10', 'E342:')
+
+ " blob slice
+ let v = 0z1020
+ call test_alloc_fail(GetAllocId('blob_alloc'), 0, 0)
+ call assert_fails('let x = v[0:0]', 'E342:')
+ call assert_equal(0z1020, x)
+
+ " blob remove()
+ let v = 0z10203040
+ call test_alloc_fail(GetAllocId('blob_alloc'), 0, 0)
+ call assert_fails('let x = remove(v, 1, 2)', 'E342:')
+ call assert_equal(0, x)
+
+ " list2blob()
+ call test_alloc_fail(GetAllocId('blob_alloc'), 0, 0)
+ call assert_fails('let a = list2blob([1, 2, 4])', 'E342:')
+ call assert_equal(0, a)
+
+ " mapnew()
+ call test_alloc_fail(GetAllocId('blob_alloc'), 0, 0)
+ call assert_fails('let x = mapnew(0z1234, {_, v -> 1})', 'E342:')
+ call assert_equal(0, x)
+
+ " copy()
+ call test_alloc_fail(GetAllocId('blob_alloc'), 0, 0)
+ call assert_fails('let x = copy(v)', 'E342:')
+ call assert_equal(0z, x)
+
+ " readblob()
+ call test_alloc_fail(GetAllocId('blob_alloc'), 0, 0)
+ call assert_fails('let x = readblob("test_blob.vim")', 'E342:')
+ call assert_equal(0, x)
+ endfunc
+
" vim: shiftwidth=2 sts=2 expandtab
*** ../vim-8.2.4669/src/testdir/test_buffer.vim 2022-04-02 21:46:14.989612828
+0100
--- src/testdir/test_buffer.vim 2022-04-03 11:14:32.028202466 +0100
***************
*** 430,479 ****
set maxmem& maxmemtot&
endfunc
! " Test for a allocation failure when adding a new buffer
func Test_buflist_alloc_failure()
%bw!
edit Xfile1
! call test_alloc_fail(GetAllocId('buflistnew_bvars'), 0, 0)
call assert_fails('edit Xfile2', 'E342:')
" test for bufadd()
! call test_alloc_fail(GetAllocId('buflistnew_bvars'), 0, 0)
call assert_fails('call bufadd("Xbuffer")', 'E342:')
" test for setting the arglist
edit Xfile2
! call test_alloc_fail(GetAllocId('buflistnew_bvars'), 0, 0)
call assert_fails('next Xfile3', 'E342:')
" test for setting the alternate buffer name when writing a file
! call test_alloc_fail(GetAllocId('buflistnew_bvars'), 0, 0)
call assert_fails('write Xother', 'E342:')
call delete('Xother')
" test for creating a buffer using bufnr()
! call test_alloc_fail(GetAllocId('buflistnew_bvars'), 0, 0)
call assert_fails("call bufnr('Xnewbuf', v:true)", 'E342:')
" test for renaming buffer using :file
! call test_alloc_fail(GetAllocId('buflistnew_bvars'), 0, 0)
call assert_fails('file Xnewfile', 'E342:')
" test for creating a buffer for a popup window
! call test_alloc_fail(GetAllocId('buflistnew_bvars'), 0, 0)
call assert_fails('call popup_create("mypop", {})', 'E342:')
if has('terminal')
" test for creating a buffer for a terminal window
! call test_alloc_fail(GetAllocId('buflistnew_bvars'), 0, 0)
call assert_fails('call term_start(&shell)', 'E342:')
%bw!
endif
" test for loading a new buffer after wiping out all the buffers
edit Xfile4
! call test_alloc_fail(GetAllocId('buflistnew_bvars'), 0, 0)
call assert_fails('%bw!', 'E342:')
" test for :checktime loading the buffer
--- 430,479 ----
set maxmem& maxmemtot&
endfunc
! " Test for buffer allocation failure
func Test_buflist_alloc_failure()
%bw!
edit Xfile1
! call test_alloc_fail(GetAllocId('newbuf_bvars'), 0, 0)
call assert_fails('edit Xfile2', 'E342:')
" test for bufadd()
! call test_alloc_fail(GetAllocId('newbuf_bvars'), 0, 0)
call assert_fails('call bufadd("Xbuffer")', 'E342:')
" test for setting the arglist
edit Xfile2
! call test_alloc_fail(GetAllocId('newbuf_bvars'), 0, 0)
call assert_fails('next Xfile3', 'E342:')
" test for setting the alternate buffer name when writing a file
! call test_alloc_fail(GetAllocId('newbuf_bvars'), 0, 0)
call assert_fails('write Xother', 'E342:')
call delete('Xother')
" test for creating a buffer using bufnr()
! call test_alloc_fail(GetAllocId('newbuf_bvars'), 0, 0)
call assert_fails("call bufnr('Xnewbuf', v:true)", 'E342:')
" test for renaming buffer using :file
! call test_alloc_fail(GetAllocId('newbuf_bvars'), 0, 0)
call assert_fails('file Xnewfile', 'E342:')
" test for creating a buffer for a popup window
! call test_alloc_fail(GetAllocId('newbuf_bvars'), 0, 0)
call assert_fails('call popup_create("mypop", {})', 'E342:')
if has('terminal')
" test for creating a buffer for a terminal window
! call test_alloc_fail(GetAllocId('newbuf_bvars'), 0, 0)
call assert_fails('call term_start(&shell)', 'E342:')
%bw!
endif
" test for loading a new buffer after wiping out all the buffers
edit Xfile4
! call test_alloc_fail(GetAllocId('newbuf_bvars'), 0, 0)
call assert_fails('%bw!', 'E342:')
" test for :checktime loading the buffer
***************
*** 484,502 ****
sleep 200m
call writefile(['two'], 'Xfile5')
set autoread
! call test_alloc_fail(GetAllocId('buflistnew_bvars'), 0, 0)
call assert_fails('checktime', 'E342:')
set autoread&
bw!
endif
" test for :vimgrep loading a dummy buffer
! call test_alloc_fail(GetAllocId('buflistnew_bvars'), 0, 0)
call assert_fails('vimgrep two Xfile5', 'E342:')
call delete('Xfile5')
" test for quickfix command loading a buffer
! call test_alloc_fail(GetAllocId('buflistnew_bvars'), 0, 0)
call assert_fails('cexpr "Xfile6:10:Line10"', 'E342:')
endfunc
--- 484,502 ----
sleep 200m
call writefile(['two'], 'Xfile5')
set autoread
! call test_alloc_fail(GetAllocId('newbuf_bvars'), 0, 0)
call assert_fails('checktime', 'E342:')
set autoread&
bw!
endif
" test for :vimgrep loading a dummy buffer
! call test_alloc_fail(GetAllocId('newbuf_bvars'), 0, 0)
call assert_fails('vimgrep two Xfile5', 'E342:')
call delete('Xfile5')
" test for quickfix command loading a buffer
! call test_alloc_fail(GetAllocId('newbuf_bvars'), 0, 0)
call assert_fails('cexpr "Xfile6:10:Line10"', 'E342:')
endfunc
*** ../vim-8.2.4669/src/testdir/test_tabpage.vim 2021-01-26
21:42:17.694836803 +0000
--- src/testdir/test_tabpage.vim 2022-04-03 11:14:32.028202466 +0100
***************
*** 852,855 ****
--- 852,878 ----
tabonly!
endfunc
+ " Test for tabpage allocation failure
+ func Test_tabpage_alloc_failure()
+ call test_alloc_fail(GetAllocId('newtabpage_tvars'), 0, 0)
+ call assert_fails('tabnew', 'E342:')
+
+ call test_alloc_fail(GetAllocId('newtabpage_tvars'), 0, 0)
+ edit Xfile1
+ call assert_fails('tabedit Xfile2', 'E342:')
+ call assert_equal(1, winnr('$'))
+ call assert_equal(1, tabpagenr('$'))
+ call assert_equal('Xfile1', @%)
+
+ new
+ call test_alloc_fail(GetAllocId('newtabpage_tvars'), 0, 0)
+ call assert_fails('wincmd T', 'E342:')
+ bw!
+
+ call test_alloc_fail(GetAllocId('newtabpage_tvars'), 0, 0)
+ call assert_fails('tab split', 'E342:')
+ call assert_equal(2, winnr('$'))
+ call assert_equal(1, tabpagenr('$'))
+ endfunc
+
" vim: shiftwidth=2 sts=2 expandtab
*** ../vim-8.2.4669/src/testdir/test_window_cmd.vim 2022-01-29
10:59:48.505909435 +0000
--- src/testdir/test_window_cmd.vim 2022-04-03 11:14:32.028202466 +0100
***************
*** 1512,1516 ****
--- 1512,1560 ----
%bwipe!
endfunc
+ " Test for window allocation failure
+ func Test_window_alloc_failure()
+ %bw!
+
+ " test for creating a new window above current window
+ call test_alloc_fail(GetAllocId('newwin_wvars'), 0, 0)
+ call assert_fails('above new', 'E342:')
+ call assert_equal(1, winnr('$'))
+
+ " test for creating a new window below current window
+ call test_alloc_fail(GetAllocId('newwin_wvars'), 0, 0)
+ call assert_fails('below new', 'E342:')
+ call assert_equal(1, winnr('$'))
+
+ " test for popup window creation failure
+ call test_alloc_fail(GetAllocId('newwin_wvars'), 0, 0)
+ call assert_fails('call popup_create("Hello", {})', 'E342:')
+ call assert_equal([], popup_list())
+
+ call test_alloc_fail(GetAllocId('newwin_wvars'), 0, 0)
+ call assert_fails('split', 'E342:')
+ call assert_equal(1, winnr('$'))
+
+ edit Xfile1
+ edit Xfile2
+ call test_alloc_fail(GetAllocId('newwin_wvars'), 0, 0)
+ call assert_fails('sb Xfile1', 'E342:')
+ call assert_equal(1, winnr('$'))
+ call assert_equal('Xfile2', @%)
+ %bw!
+
+ " FIXME: The following test crashes Vim
+ " test for new tabpage creation failure
+ " call test_alloc_fail(GetAllocId('newwin_wvars'), 0, 0)
+ " call assert_fails('tabnew', 'E342:')
+ " call assert_equal(1, tabpagenr('$'))
+ " call assert_equal(1, winnr('$'))
+
+ " This test messes up the internal Vim window/frame information. So the
+ " Test_window_cmd_cmdwin_with_vsp() test fails after running this test.
+ " Open a new tab and close everything else to fix this issue.
+ tabnew
+ tabonly
+ endfunc
" vim: shiftwidth=2 sts=2 expandtab
*** ../vim-8.2.4669/src/version.c 2022-04-02 21:59:02.485697387 +0100
--- src/version.c 2022-04-03 11:17:39.852023001 +0100
***************
*** 752,753 ****
--- 752,755 ----
{ /* Add new patch number below this line */
+ /**/
+ 4670,
/**/
--
[Another hideous roar.]
BEDEVERE: That's it!
ARTHUR: What?
BEDEVERE: It's The Legendary Black Beast of Aaaaarrrrrrggghhh!
"Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
/// Bram Moolenaar -- [email protected] -- http://www.Moolenaar.net \\\
/// \\\
\\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To view this discussion on the web visit
https://groups.google.com/d/msgid/vim_dev/20220403102310.AC3ED1C0561%40moolenaar.net.
