Permalink
Browse files

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.
  • Loading branch information...
brammool committed Feb 26, 2017
1 parent 3764076 commit ba748c8a847561c043a63827bcb1d98bdebe16e6
Showing with 21 additions and 2 deletions.
  1. +2 −0 src/ex_cmds.c
  2. +9 −2 src/ex_getln.c
  3. +8 −0 src/testdir/test_substitute.vim
  4. +2 −0 src/version.c
View
@@ -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)
{
View
@@ -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.
@@ -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
View
@@ -764,6 +764,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
+/**/
+ 374,
/**/
373,
/**/

0 comments on commit ba748c8

Please sign in to comment.