Mercurial > vim
changeset 7330:8ab712f2c3b8 v7.4.970
commit https://github.com/vim/vim/commit/9ec021a2b0dd35ba744a8e2a9430a643c85b922a
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Dec 12 16:23:29 2015 +0100
patch 7.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)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sat, 12 Dec 2015 16:30:04 +0100 |
| parents | f5a4e5697665 |
| children | 8351346c290a |
| files | src/mbyte.c src/version.c |
| diffstat | 2 files changed, 3 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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;