updated for version 7.4.514

Problem:    Memory access error. (Dominique Pelle)
Solution:   Update tpos. (Christian Brabandt)

diff --git a/src/edit.c b/src/edit.c
index ee63daa1c7bf5b6ee189cf87f9e1409ebaba889e..13faafeb785c7612858eabca45b54cb3c3f2432c 100644 (file)
--- a/src/edit.c
+++ b/src/edit.c
@@ -6918,6 +6918,8 @@ stop_insert(end_insert_pos, esc, nomove)
                curwin->w_cursor = tpos;
            else
            {
+               /* reset tpos, could have been invalidated in the loop above */
+               tpos = curwin->w_cursor;
                tpos.col++;
                if (cc != NUL && gchar_pos(&tpos) == NUL)
                    ++curwin->w_cursor.col;     /* put cursor back on the NUL */

diff --git a/src/version.c b/src/version.c
index df18f5e962397443c91bef609c9c3321a0abaf2b..5ca2f2723c021877793efd3e7809b2a5e5317aa2 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 */
+/**/
+    514,
 /**/
     513,
 /**/