vim-patch:9.0.0614: SpellFileMissing autocmd may delete buffer

Problem:    SpellFileMissing autocmd may delete buffer.
Solution:   Disallow deleting the current buffer to avoid using freed memory.
ef976323e7
This commit is contained in:
zeertzjq 2022-10-15 16:10:56 +08:00
parent 65cbe0cc35
commit 6bc2d6b66b
4 changed files with 24 additions and 2 deletions

View File

@ -93,6 +93,8 @@
#endif
static char *e_auabort = N_("E855: Autocommands caused command to abort");
static char e_attempt_to_delete_buffer_that_is_in_use_str[]
= N_("E937: Attempt to delete a buffer that is in use: %s");
// Number of times free_buffer() was called.
static int buf_free_count = 0;
@ -416,7 +418,9 @@ static bool can_unload_buffer(buf_T *buf)
}
}
if (!can_unload) {
emsg(_("E937: Attempt to delete a buffer that is in use"));
char *fname = buf->b_fname != NULL ? buf->b_fname : buf->b_ffname;
semsg(_(e_attempt_to_delete_buffer_that_is_in_use_str),
fname != NULL ? fname : "[No Name]");
}
return can_unload;
}

View File

@ -1511,6 +1511,10 @@ static void spell_load_lang(char_u *lang)
sl.sl_slang = NULL;
sl.sl_nobreak = false;
// Disallow deleting the current buffer. Autocommands can do weird things
// and cause "lang" to be freed.
curbuf->b_locked++;
// We may retry when no spell file is found for the language, an
// autocommand may load it then.
for (int round = 1; round <= 2; round++) {
@ -1553,6 +1557,8 @@ static void spell_load_lang(char_u *lang)
STRCPY(fname_enc + strlen(fname_enc) - 3, "add.spl");
do_in_runtimepath((char *)fname_enc, DIP_ALL, spell_load_cb, &sl);
}
curbuf->b_locked--;
}
// Return the encoding used for spell checking: Use 'encoding', except that we

View File

@ -2752,6 +2752,16 @@ func Test_FileType_spell()
setglobal spellfile=
endfunc
" this was wiping out the current buffer and using freed memory
func Test_SpellFileMissing_bwipe()
next 0
au SpellFileMissing 0 bwipe
call assert_fails('set spell spelllang=0', 'E937:')
au! SpellFileMissing
bwipe
endfunc
" Test closing a window or editing another buffer from a FileChangedRO handler
" in a readonly buffer
func Test_FileChangedRO_winclose()

View File

@ -5,6 +5,7 @@ local clear, command, nvim, testprg =
helpers.clear, helpers.command, helpers.nvim, helpers.testprg
local eval, eq, neq, retry =
helpers.eval, helpers.eq, helpers.neq, helpers.retry
local matches = helpers.matches
local ok = helpers.ok
local feed = helpers.feed
local pcall_err = helpers.pcall_err
@ -22,7 +23,8 @@ describe('autocmd TermClose', function()
local function test_termclose_delete_own_buf()
command('autocmd TermClose * bdelete!')
command('terminal')
eq('Vim(bdelete):E937: Attempt to delete a buffer that is in use', pcall_err(command, 'bdelete!'))
matches('^Vim%(bdelete%):E937: Attempt to delete a buffer that is in use: term://',
pcall_err(command, 'bdelete!'))
assert_alive()
end