diff options
| author | Florian Walch <florian@fwalch.com> | 2015-01-23 13:13:12 +0100 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2015-01-26 02:19:14 -0500 |
| commit | 51aacc2dea9858228fd387c91d7261b86f0df652 (patch) | |
| tree | 8ad69098d72243318717f91498a817322ec2e15f /src | |
| parent | 0f2d02569cd41e1ffac4195ec47b1ca9b3f08418 (diff) | |
| download | rneovim-51aacc2dea9858228fd387c91d7261b86f0df652.tar.gz rneovim-51aacc2dea9858228fd387c91d7261b86f0df652.tar.bz2 rneovim-51aacc2dea9858228fd387c91d7261b86f0df652.zip | |
vim-patch:7.4.514
Problem: Memory access error. (Dominique Pelle)
Solution: Update tpos. (Christian Brabandt)
https://code.google.com/p/vim/source/detail?r=v7-4-514
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/edit.c | 2 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/nvim/edit.c b/src/nvim/edit.c index 03dceaf092..df45f57606 100644 --- a/src/nvim/edit.c +++ b/src/nvim/edit.c @@ -5752,6 +5752,8 @@ stop_insert ( if (curwin->w_cursor.lnum != tpos.lnum) 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/nvim/version.c b/src/nvim/version.c index b0bd38b7de..230898bddd 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -253,7 +253,7 @@ static int included_patches[] = { //517, 516, //515, - //514, + 514, 513, //512 NA //511 NA |