thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 7.4.970

Browse Source 
Problem:    Rare crash in getvcol(). (Timo Mihaljov)
Solution:   Check for the buffer being NULL in init_preedit_start_col.
            (Hirohito Higashi, Christian Brabandt)
This commit is contained in:
Bram Moolenaar
2015-12-12 16:23:29 +01:00
parent 35be4534c0
commit 9ec021a2b0
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/mbyte.c
View File

@@ -4541,7 +4541,7 @@ init_preedit_start_col(void)
{ {
if (State & CMDLINE) if (State & CMDLINE)
preedit_start_col = cmdline_getvcol_cursor(); preedit_start_col = cmdline_getvcol_cursor();
else if (curwin != NULL) else if (curwin != NULL && curwin->w_buffer != NULL)
getvcol(curwin, &curwin->w_cursor, &preedit_start_col, NULL, NULL); getvcol(curwin, &curwin->w_cursor, &preedit_start_col, NULL, NULL);
/* Prevent that preediting marks the buffer as changed. */ /* Prevent that preediting marks the buffer as changed. */
xim_changed_while_preediting = curbuf->b_changed; xim_changed_while_preediting = curbuf->b_changed;

2
src/version.c
View File

@@ -741,6 +741,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 */
/**/
970,
/**/ /**/
969, 969,
/**/ /**/