Skip to content

Commit

Permalink
patch 9.0.0228: crash when pattern looks below the last line
Browse files Browse the repository at this point in the history
Problem:    Crash when pattern looks below the last line.
Solution:   Consider invalid lines to be empty. (closes #10938)
  • Loading branch information
brammool committed Aug 19, 2022
1 parent 213e70e commit 13ed494
Show file tree
Hide file tree
Showing 4 changed files with 35 additions and 10 deletions.
17 changes: 11 additions & 6 deletions src/regexp_bt.c
Expand Up @@ -3439,12 +3439,17 @@ regmatch(
break;

case RE_VCOL:
if (!re_num_cmp((long_u)win_linetabsize(
rex.reg_win == NULL ? curwin : rex.reg_win,
rex.reg_firstlnum + rex.lnum,
rex.line,
(colnr_T)(rex.input - rex.line)) + 1, scan))
status = RA_NOMATCH;
{
win_T *wp = rex.reg_win == NULL ? curwin : rex.reg_win;
linenr_T lnum = rex.reg_firstlnum + rex.lnum;
long_u vcol = 0;

if (lnum > 0 && lnum <= wp->w_buffer->b_ml.ml_line_count)
vcol = (long_u)win_linetabsize(wp, lnum, rex.line,
(colnr_T)(rex.input - rex.line));
if (!re_num_cmp(vcol + 1, scan))
status = RA_NOMATCH;
}
break;

case BOW: // \<word; rex.input points to w
Expand Down
14 changes: 10 additions & 4 deletions src/regexp_nfa.c
Expand Up @@ -6774,10 +6774,16 @@ nfa_regmatch(
result = col > t->state->val * ts;
}
if (!result)
result = nfa_re_num_cmp(t->state->val, op,
(long_u)win_linetabsize(wp,
rex.reg_firstlnum + rex.lnum,
rex.line, col) + 1);
{
linenr_T lnum = rex.reg_firstlnum + rex.lnum;
long_u vcol = 0;

if (lnum > 0
&& lnum <= wp->w_buffer->b_ml.ml_line_count)
vcol = (long_u)win_linetabsize(wp, lnum,
rex.line, col);
result = nfa_re_num_cmp(t->state->val, op, vcol + 1);
}
if (result)
{
add_here = TRUE;
Expand Down
12 changes: 12 additions & 0 deletions src/testdir/test_regexp_latin.vim
Expand Up @@ -1129,4 +1129,16 @@ func Test_recursive_substitute_expr()
delfunc Repl
endfunc

def Test_compare_columns()
# this was using a line below the last line
enew
setline(1, ['', ''])
prop_type_add('name', {highlight: 'ErrorMsg'})
prop_add(1, 1, {length: 1, type: 'name'})
search('\%#=1\%>.l\n.*\%<2v', 'nW')
search('\%#=2\%>.l\n.*\%<2v', 'nW')
bwipe!
prop_type_delete('name')
enddef

" vim: shiftwidth=2 sts=2 expandtab
2 changes: 2 additions & 0 deletions src/version.c
Expand Up @@ -731,6 +731,8 @@ static char *(features[]) =

static int included_patches[] =
{ /* Add new patch number below this line */
/**/
228,
/**/
227,
/**/
Expand Down

0 comments on commit 13ed494

Please sign in to comment.