diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-01-07 20:11:42 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-01-07 20:11:42 +0100 |
| commit | ce6db0273f2c4359f48d75103a42991aa481f14e (patch) | |
| tree | 1cb0e8a9563a92d4a92ff9ae0f00b0b6998e6c27 | |
| parent | fbcdf671f08cd2c7e60f35574231df0421112d99 (diff) | |
| download | vim-git-ce6db0273f2c4359f48d75103a42991aa481f14e.tar.gz | |
patch 8.2.0097: crash with autocommand and spellfilev8.2.0097
Problem: Crash with autocommand and spellfile. (Tim Pope)
Solution: Do not pop exestack when not pushed. (closes #5450)
| -rw-r--r-- | src/spellfile.c | 5 | ||||
| -rw-r--r-- | src/testdir/test_autocmd.vim | 22 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 28 insertions, 1 deletions
diff --git a/src/spellfile.c b/src/spellfile.c index 6cad202fd..fa450f33d 100644 --- 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; } diff --git a/src/testdir/test_autocmd.vim b/src/testdir/test_autocmd.vim index ab0240239..23deec6c3 100644 --- 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 diff --git a/src/version.c b/src/version.c index f51df26c4..b476e25a4 100644 --- a/src/version.c +++ b/src/version.c @@ -743,6 +743,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 97, +/**/ 96, /**/ 95, |