Mercurial > vim
changeset 19073:45eb6f37692e v8.2.0097
patch 8.2.0097: crash with autocommand and spellfile
Commit: https://github.com/vim/vim/commit/ce6db0273f2c4359f48d75103a42991aa481f14e
Author: Bram Moolenaar <Bram@vim.org>
Date: Tue Jan 7 20:11:42 2020 +0100
patch 8.2.0097: crash with autocommand and spellfile
Problem: Crash with autocommand and spellfile. (Tim Pope)
Solution: Do not pop exestack when not pushed. (closes https://github.com/vim/vim/issues/5450)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Tue, 07 Jan 2020 20:15:04 +0100 |
| parents | 2f2bddf195ef |
| children | d7a865d2db06 |
| files | src/spellfile.c src/testdir/test_autocmd.vim src/version.c |
| diffstat | 3 files changed, 28 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/spellfile.c +++ b/src/spellfile.c @@ -352,6 +352,7 @@ spell_load_file( slang_T *lp = NULL; int c = 0; int res; + int did_estack_push = FALSE; fd = mch_fopen((char *)fname, "r"); if (fd == NULL) @@ -392,6 +393,7 @@ spell_load_file( // Set sourcing_name, so that error messages mention the file name. estack_push(ETYPE_SPELL, fname, 0); + did_estack_push = TRUE; /* * <HEADER>: <fileID> @@ -578,7 +580,8 @@ endFAIL: endOK: if (fd != NULL) fclose(fd); - estack_pop(); + if (did_estack_push) + estack_pop(); return lp; }
--- a/src/testdir/test_autocmd.vim +++ b/src/testdir/test_autocmd.vim @@ -2335,3 +2335,25 @@ func Test_BufWrite_lockmarks() call delete('Xtest') call delete('Xtest2') endfunc + +func Test_FileType_spell() + if !isdirectory('/tmp') + throw "Skipped: requires /tmp directory" + endif + + " this was crashing with an invalid free() + setglobal spellfile=/tmp/en.utf-8.add + augroup crash + autocmd! + autocmd BufNewFile,BufReadPost crashfile setf somefiletype + autocmd BufNewFile,BufReadPost crashfile set ft=anotherfiletype + autocmd FileType anotherfiletype setlocal spell + augroup END + func! NoCrash() abort + edit /tmp/crashfile + endfunc + call NoCrash() + + au! crash + setglobal spellfile= +endfunc