From: Bram Moolenaar <Bram@vim.org>
Date: Sat, 12 Dec 2015 15:23:29 +0000 (+0100)
Subject: patch 7.4.970
X-Git-Tag: v7.4.970
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9ec021a2b0dd35ba744a8e2a9430a643c85b922a;p=vim

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)
---

diff --git a/src/mbyte.c b/src/mbyte.c
index 6046d7d0b..edca9a709 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 62990fc66..803e139a2 100644
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    970,
 /**/
     969,
 /**/