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 6046d7d0ba06d8cf5829bb32e858b60aa74afadd..edca9a709bb0172b363fc4d898ec01de99acaa14 100644 (file)
--- 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 62990fc66bf19e770d6174c589caf38295c32380..803e139a2ea0f07ada8df25c664a185ec2fbfc88 100644 (file)
--- 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,
 /**/