diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-02-26 14:00:07 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-02-26 14:00:07 +0100 |
| commit | ba748c8a847561c043a63827bcb1d98bdebe16e6 (patch) | |
| tree | 9c5660b52127b6e85fc48ea5187700f28ad31d4b | |
| parent | 376407674ff10b60e7c6090906be50982763f0f3 (diff) | |
| download | vim-git-ba748c8a847561c043a63827bcb1d98bdebe16e6.tar.gz | |
patch 8.0.0374: invalid memory access when using :sc in Ex modev8.0.0374
Problem: Invalid memory access when using :sc in Ex mode. (Dominique Pelle)
Solution: Avoid the column being negative. Also fix a hang in Ex mode.
| -rw-r--r-- | src/ex_cmds.c | 2 | ||||
| -rw-r--r-- | src/ex_getln.c | 11 | ||||
| -rw-r--r-- | src/testdir/test_substitute.vim | 8 | ||||
| -rw-r--r-- | src/version.c | 2 |
4 files changed, 21 insertions, 2 deletions
diff --git a/src/ex_cmds.c b/src/ex_cmds.c index 5b118e564..c38687d74 100644 --- a/src/ex_cmds.c +++ b/src/ex_cmds.c @@ -5288,6 +5288,8 @@ do_sub(exarg_T *eap) getvcol(curwin, &curwin->w_cursor, &sc, NULL, NULL); curwin->w_cursor.col = regmatch.endpos[0].col - 1; + if (curwin->w_cursor.col < 0) + curwin->w_cursor.col = 0; getvcol(curwin, &curwin->w_cursor, NULL, NULL, &ec); if (subflags.do_number || curwin->w_p_nu) { diff --git a/src/ex_getln.c b/src/ex_getln.c index 3c40ff79a..918031914 100644 --- a/src/ex_getln.c +++ b/src/ex_getln.c @@ -2369,9 +2369,16 @@ getexmodeline( if (ga_grow(&line_ga, 40) == FAIL) break; - /* Get one character at a time. */ + /* + * Get one character at a time. + */ prev_char = c1; - c1 = vgetc(); + + /* Check for a ":normal" command and no more characters left. */ + if (ex_normal_busy > 0 && typebuf.tb_len == 0) + c1 = '\n'; + else + c1 = vgetc(); /* * Handle line editing. diff --git a/src/testdir/test_substitute.vim b/src/testdir/test_substitute.vim index a3bc04dcd..f2dfdc701 100644 --- a/src/testdir/test_substitute.vim +++ b/src/testdir/test_substitute.vim @@ -106,3 +106,11 @@ function! Test_substitute_variants() endfor endfor endfunction + +func Test_substitute_repeat() + " This caused an invalid memory access. + split Xfile + s/^/x + call feedkeys("Qsc\<CR>y", 'tx') + bwipe! +endfunc diff --git a/src/version.c b/src/version.c index b008d1408..b96daff1c 100644 --- a/src/version.c +++ b/src/version.c @@ -765,6 +765,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 374, +/**/ 373, /**/ 372, |