Mercurial > vim
changeset 17184:a5c3d374e1d3 v8.1.1591
patch 8.1.1591: on error garbage collection may free memory in use
commit https://github.com/vim/vim/commit/7d491c425334d9477637372a4ebec64c228c8430
Author: Bram Moolenaar <Bram@vim.org>
Date: Tue Jun 25 06:28:02 2019 +0200
patch 8.1.1591: on error garbage collection may free memory in use
Problem: On error garbage collection may free memory in use.
Solution: Reset may_garbage_collect when evaluating expression mapping.
Add tests. (Ozaki Kiichi, closes #4579)
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Tue, 25 Jun 2019 06:30:09 +0200 |
parents | 694c578dedd2 |
children | bb5e800dda4a |
files | src/ex_cmds2.c src/getchar.c src/testdir/test_mapping.vim src/testdir/test_timers.vim src/testdir/test_vimscript.vim src/version.c |
diffstat | 6 files changed, 82 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ex_cmds2.c +++ b/src/ex_cmds2.c @@ -367,8 +367,8 @@ check_due_timer(void) int save_vgetc_busy = vgetc_busy; int save_did_emsg = did_emsg; int save_called_emsg = called_emsg; - int save_must_redraw = must_redraw; - int save_trylevel = trylevel; + int save_must_redraw = must_redraw; + int save_trylevel = trylevel; int save_did_throw = did_throw; int save_ex_pressedreturn = get_pressedreturn(); int save_may_garbage_collect = may_garbage_collect;
--- a/src/getchar.c +++ b/src/getchar.c @@ -2540,13 +2540,18 @@ vgetorpeek(int advance) */ if (mp->m_expr) { - int save_vgetc_busy = vgetc_busy; + int save_vgetc_busy = vgetc_busy; + int save_may_garbage_collect = may_garbage_collect; vgetc_busy = 0; + may_garbage_collect = FALSE; + save_m_keys = vim_strsave(mp->m_keys); save_m_str = vim_strsave(mp->m_str); s = eval_map_expr(save_m_str, NUL); + vgetc_busy = save_vgetc_busy; + may_garbage_collect = save_may_garbage_collect; } else #endif
--- a/src/testdir/test_mapping.vim +++ b/src/testdir/test_mapping.vim @@ -397,3 +397,39 @@ func Test_motionforce_omap() delfunc Select delfunc GetCommand endfunc + +func Test_error_in_map_expr() + if !has('terminal') || (has('win32') && has('gui_running')) + throw 'Skipped: cannot run Vim in a terminal window' + endif + + let lines =<< trim [CODE] + func Func() + " fail to create list + let x = [ + endfunc + nmap <expr> ! Func() + set updatetime=50 + [CODE] + call writefile(lines, 'Xtest.vim') + + let buf = term_start(GetVimCommandClean() .. ' -S Xtest.vim', {'term_rows': 8}) + let job = term_getjob(buf) + call WaitForAssert({-> assert_notequal('', term_getline(buf, 8))}) + + " GC must not run during map-expr processing, which can make Vim crash. + call term_sendkeys(buf, '!') + call term_wait(buf, 100) + call term_sendkeys(buf, "\<CR>") + call term_wait(buf, 100) + call assert_equal('run', job_status(job)) + + call term_sendkeys(buf, ":qall!\<CR>") + call WaitFor({-> job_status(job) ==# 'dead'}) + if has('unix') + call assert_equal('', job_info(job).termsig) + endif + + call delete('Xtest.vim') + exe buf .. 'bwipe!' +endfunc
--- a/src/testdir/test_timers.vim +++ b/src/testdir/test_timers.vim @@ -333,4 +333,39 @@ func Test_nocatch_garbage_collect() delfunc FeedChar endfunc +func Test_error_in_timer_callback() + if !has('terminal') || (has('win32') && has('gui_running')) + throw 'Skipped: cannot run Vim in a terminal window' + endif + + let lines =<< trim [CODE] + func Func(timer) + " fail to create list + let x = [ + endfunc + set updatetime=50 + call timer_start(1, 'Func') + [CODE] + call writefile(lines, 'Xtest.vim') + + let buf = term_start(GetVimCommandClean() .. ' -S Xtest.vim', {'term_rows': 8}) + let job = term_getjob(buf) + call WaitForAssert({-> assert_notequal('', term_getline(buf, 8))}) + + " GC must not run during timer callback, which can make Vim crash. + call term_wait(buf, 100) + call term_sendkeys(buf, "\<CR>") + call term_wait(buf, 100) + call assert_equal('run', job_status(job)) + + call term_sendkeys(buf, ":qall!\<CR>") + call WaitFor({-> job_status(job) ==# 'dead'}) + if has('unix') + call assert_equal('', job_info(job).termsig) + endif + + call delete('Xtest.vim') + exe buf .. 'bwipe!' +endfunc + " vim: shiftwidth=2 sts=2 expandtab