mirror of
https://github.com/vim/vim.git
synced 2025-09-24 03:44:06 -04:00
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.
This commit is contained in:
@@ -5288,6 +5288,8 @@ do_sub(exarg_T *eap)
|
|||||||
|
|
||||||
getvcol(curwin, &curwin->w_cursor, &sc, NULL, NULL);
|
getvcol(curwin, &curwin->w_cursor, &sc, NULL, NULL);
|
||||||
curwin->w_cursor.col = regmatch.endpos[0].col - 1;
|
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);
|
getvcol(curwin, &curwin->w_cursor, NULL, NULL, &ec);
|
||||||
if (subflags.do_number || curwin->w_p_nu)
|
if (subflags.do_number || curwin->w_p_nu)
|
||||||
{
|
{
|
||||||
|
@@ -2369,9 +2369,16 @@ getexmodeline(
|
|||||||
if (ga_grow(&line_ga, 40) == FAIL)
|
if (ga_grow(&line_ga, 40) == FAIL)
|
||||||
break;
|
break;
|
||||||
|
|
||||||
/* Get one character at a time. */
|
/*
|
||||||
|
* Get one character at a time.
|
||||||
|
*/
|
||||||
prev_char = c1;
|
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.
|
* Handle line editing.
|
||||||
|
@@ -106,3 +106,11 @@ function! Test_substitute_variants()
|
|||||||
endfor
|
endfor
|
||||||
endfor
|
endfor
|
||||||
endfunction
|
endfunction
|
||||||
|
|
||||||
|
func Test_substitute_repeat()
|
||||||
|
" This caused an invalid memory access.
|
||||||
|
split Xfile
|
||||||
|
s/^/x
|
||||||
|
call feedkeys("Qsc\<CR>y", 'tx')
|
||||||
|
bwipe!
|
||||||
|
endfunc
|
||||||
|
@@ -764,6 +764,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
374,
|
||||||
/**/
|
/**/
|
||||||
373,
|
373,
|
||||||
/**/
|
/**/
|
||||||
|
Reference in New Issue
Block a user