mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-07 11:58:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:9.0.0228: crash when pattern looks below the last line

Browse Source 
Problem:    Crash when pattern looks below the last line.
Solution:   Consider invalid lines to be empty. (closes vim/vim#10938)

13ed494bb5

Comment out the test as it uses Vim9 script and text properties.

Co-authored-by: Bram Moolenaar <Bram@vim.org>
This commit is contained in:
zeertzjq
2024-07-17 10:31:23 +08:00
parent 8f890f74b6
commit dce615bc42
2 changed files with 31 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/nvim/regexp.c
View File

@@ -6254,15 +6254,21 @@ static bool regmatch(uint8_t *scan, const proftime_T *tm, int *timed_out)
} }
break; break;
case RE_VCOL: case RE_VCOL: {
if (!re_num_cmp((unsigned)win_linetabsize(rex.reg_win == NULL ? curwin : rex.reg_win, win_T *wp = rex.reg_win == NULL ? curwin : rex.reg_win;
rex.reg_firstlnum + rex.lnum, linenr_T lnum = rex.reg_firstlnum + rex.lnum;
(char *)rex.line, int vcol = 0;
(colnr_T)(rex.input - rex.line)) + 1,
scan)) { if (lnum > 0 && lnum <= wp->w_buffer->b_ml.ml_line_count) {
vcol = win_linetabsize(wp, lnum, (char *)rex.line,
(colnr_T)(rex.input - rex.line));
}
if (!re_num_cmp((uint32_t)vcol + 1, scan)) {
status = RA_NOMATCH; status = RA_NOMATCH;
} }
break; break;
}
break;
case BOW: // \<word; rex.input points to w case BOW: // \<word; rex.input points to w
if (c == NUL) { // Can't match at end of line if (c == NUL) { // Can't match at end of line
@@ -15099,9 +15105,14 @@ static int nfa_regmatch(nfa_regprog_T *prog, nfa_state_T *start, regsubs_T *subm
result = col > t->state->val * ts; result = col > t->state->val * ts;
} }
if (!result) { if (!result) {
int lts = win_linetabsize(wp, rex.reg_firstlnum + rex.lnum, (char *)rex.line, col); linenr_T lnum = rex.reg_firstlnum + rex.lnum;
int vcol = 0;
if (lnum > 0 && lnum <= wp->w_buffer->b_ml.ml_line_count) {
vcol = win_linetabsize(wp, lnum, (char *)rex.line, col);
}
assert(t->state->val >= 0); assert(t->state->val >= 0);
result = nfa_re_num_cmp((uintmax_t)t->state->val, op, (uintmax_t)lts + 1); result = nfa_re_num_cmp((uintmax_t)t->state->val, op, (uintmax_t)vcol + 1);
} }
if (result) { if (result) {
add_here = true; add_here = true;

12
test/old/testdir/test_regexp_latin.vim
View File

@@ -1135,4 +1135,16 @@ func Test_recursive_substitute_expr()
delfunc Repl delfunc Repl
endfunc 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 " vim: shiftwidth=2 sts=2 expandtab