summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2014-11-12 18:59:25 +0100
committerBram Moolenaar <Bram@vim.org>2014-11-12 18:59:25 +0100
commitef6875be7a0b4dde9589e69b0a0229c4b976c45b (patch)
treec89cac94fc685ca7ab617511727eabdaa8487ce5
parent42d84f8aed604e32e198a5fe31b3b7ab149ea63e (diff)
downloadvim-ef6875be7a0b4dde9589e69b0a0229c4b976c45b.zip
updated for version 7.4.514
Problem: Memory access error. (Dominique Pelle) Solution: Update tpos. (Christian Brabandt)
-rw-r--r--src/edit.c2
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/src/edit.c b/src/edit.c
index ee63daa1c..13faafeb7 100644
--- 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 df18f5e96..5ca2f2723 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 */
/**/
+ 514,
+/**/
513,
/**/
512,