aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-27 04:14:06 -04:00
Code Activity

updated for version 7.2.332

Browse Source 
Problem:    Crash when spell correcting triggers an autocommand that reloads
            the buffer.
Solution:   Make a copy of the line to be modified. (Dominique Pelle)
This commit is contained in:
Bram Moolenaar
2010-01-19 13:08:42 +01:00
parent f68f656213
commit 3ea38ef239
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/spell.c
View File

@@ -10306,7 +10306,10 @@ spell_suggest(count)
/* Figure out if the word should be capitalised. */ /* Figure out if the word should be capitalised. */
need_cap = check_need_cap(curwin->w_cursor.lnum, curwin->w_cursor.col); need_cap = check_need_cap(curwin->w_cursor.lnum, curwin->w_cursor.col);
line = ml_get_curline(); /* Make a copy of current line since autocommands may free the line. */
line = vim_strsave(ml_get_curline());
if (line == NULL)
goto skip;
/* Get the list of suggestions. Limit to 'lines' - 2 or the number in /* Get the list of suggestions. Limit to 'lines' - 2 or the number in
* 'spellsuggest', whatever is smaller. */ * 'spellsuggest', whatever is smaller. */
@@ -10470,6 +10473,8 @@ spell_suggest(count)
curwin->w_cursor = prev_cursor; curwin->w_cursor = prev_cursor;
spell_find_cleanup(&sug); spell_find_cleanup(&sug);
skip:
vim_free(line);
} }
/* /*
@@ -10931,7 +10936,7 @@ spell_suggest_intern(su, interactive)
rescore_suggestions(su); rescore_suggestions(su);
/* /*
* While going throught the soundfold tree "su_maxscore" is the score * While going through the soundfold tree "su_maxscore" is the score
* for the soundfold word, limits the changes that are being tried, * for the soundfold word, limits the changes that are being tried,
* and "su_sfmaxscore" the rescored score, which is set by * and "su_sfmaxscore" the rescored score, which is set by
* cleanup_suggestions(). * cleanup_suggestions().
@@ -11415,7 +11420,7 @@ suggest_trie_walk(su, lp, fword, soundfold)
char_u tword[MAXWLEN]; /* good word collected so far */ char_u tword[MAXWLEN]; /* good word collected so far */
trystate_T stack[MAXWLEN]; trystate_T stack[MAXWLEN];
char_u preword[MAXWLEN * 3]; /* word found with proper case; char_u preword[MAXWLEN * 3]; /* word found with proper case;
* concatanation of prefix compound * concatenation of prefix compound
* words and split word. NUL terminated * words and split word. NUL terminated
* when going deeper but not when coming * when going deeper but not when coming
* back. */ * back. */

2
src/version.c
View File

@@ -681,6 +681,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
332,
/**/ /**/
331, 331,
/**/ /**/