Mercurial > vim
changeset 10970:ab9f7bbe4439 v8.0.0374
patch 8.0.0374: invalid memory access when using :sc in Ex mode
commit https://github.com/vim/vim/commit/ba748c8a847561c043a63827bcb1d98bdebe16e6
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Feb 26 14:00:07 2017 +0100
patch 8.0.0374: invalid memory access when using :sc in Ex mode
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.
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sun, 26 Feb 2017 14:15:04 +0100 |
| parents | beefabd60ec9 |
| children | a53e4f26c2a2 |
| files | src/ex_cmds.c src/ex_getln.c src/testdir/test_substitute.vim src/version.c |
| diffstat | 4 files changed, 21 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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) {
--- 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.
--- 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