diff options
| author | Bram Moolenaar <Bram@vim.org> | 2015-12-12 16:23:29 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2015-12-12 16:23:29 +0100 |
| commit | 9ec021a2b0dd35ba744a8e2a9430a643c85b922a (patch) | |
| tree | 3d0072340e4220394ae14d4d17aec0e8df46f5b8 | |
| parent | 35be4534c029148a89ccc41e8e465d793e7ed7c2 (diff) | |
patch 7.4.970v7.4.970
Problem: Rare crash in getvcol(). (Timo Mihaljov)
Solution: Check for the buffer being NULL in init_preedit_start_col.
(Hirohito Higashi, Christian Brabandt)
| -rw-r--r-- | src/mbyte.c | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/mbyte.c b/src/mbyte.c index 6046d7d0ba..edca9a709b 100644 --- a/src/mbyte.c +++ b/src/mbyte.c @@ -4541,7 +4541,7 @@ init_preedit_start_col(void) { if (State & CMDLINE) 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); /* Prevent that preediting marks the buffer as changed. */ xim_changed_while_preediting = curbuf->b_changed; diff --git a/src/version.c b/src/version.c index 62990fc66b..803e139a2e 100644 --- a/src/version.c +++ b/src/version.c @@ -742,6 +742,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 970, +/**/ 969, /**/ 968, |