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 #5450)
diff --git a/src/spellfile.c b/src/spellfile.c
index 6cad202..fa450f3 100644
--- a/src/spellfile.c
+++ b/src/spellfile.c
@@ -352,6 +352,7 @@
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 @@
// 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 @@
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 ab02402..23deec6 100644
--- a/src/testdir/test_autocmd.vim
+++ b/src/testdir/test_autocmd.vim
@@ -2335,3 +2335,25 @@
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 f51df26..b476e25 100644
--- a/src/version.c
+++ b/src/version.c
@@ -743,6 +743,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 97,
+/**/
96,
/**/
95,