Mercurial > vim
diff src/regexp_nfa.c @ 29777:f1c5bd4acbbc v9.0.0228
patch 9.0.0228: crash when pattern looks below the last line
Commit: https://github.com/vim/vim/commit/13ed494bb5edc5a02d0ed0feabddb68920f88570
Author: Bram Moolenaar <Bram@vim.org>
Date: Fri Aug 19 13:59:25 2022 +0100
patch 9.0.0228: crash when pattern looks below the last line
Problem: Crash when pattern looks below the last line.
Solution: Consider invalid lines to be empty. (closes https://github.com/vim/vim/issues/10938)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Fri, 19 Aug 2022 15:00:04 +0200 |
| parents | 057c26b5c33a |
| children | 22a5ccc0d634 |
line wrap: on
line diff
--- a/src/regexp_nfa.c +++ b/src/regexp_nfa.c @@ -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;