Mercurial > vim
changeset 23150:90b16a0022e5 v8.2.2121
patch 8.2.2121: internal error when using ze before zs in a pattern
Commit: https://github.com/vim/vim/commit/a7a691cc142439e266f4ceb1f208bb952b57aa71
Author: Bram Moolenaar <Bram@vim.org>
Date: Wed Dec 9 16:36:04 2020 +0100
patch 8.2.2121: internal error when using \ze before \zs in a pattern
Problem: Internal error when using \ze before \zs in a pattern.
Solution: Check the end is never before the start. (closes https://github.com/vim/vim/issues/7442)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Wed, 09 Dec 2020 16:45:04 +0100 |
| parents | e427a5961456 |
| children | 7cd2122d2daf |
| files | src/regexp_bt.c src/regexp_nfa.c src/testdir/test_regexp_latin.vim src/version.c |
| diffstat | 4 files changed, 43 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/regexp_bt.c +++ b/src/regexp_bt.c @@ -4805,6 +4805,23 @@ theend: if (backpos.ga_maxlen > BACKPOS_INITIAL) ga_clear(&backpos); + // Make sure the end is never before the start. Can happen when \zs and + // \ze are used. + if (REG_MULTI) + { + lpos_T *start = &rex.reg_mmatch->startpos[0]; + lpos_T *end = &rex.reg_mmatch->endpos[0]; + + if (end->lnum < start->lnum + || (end->lnum == start->lnum && end->col < start->col)) + rex.reg_mmatch->endpos[0] = rex.reg_mmatch->startpos[0]; + } + else + { + if (rex.reg_match->endp[0] < rex.reg_match->startp[0]) + rex.reg_match->endp[0] = rex.reg_match->startp[0]; + } + return retval; }
--- a/src/regexp_nfa.c +++ b/src/regexp_nfa.c @@ -7225,6 +7225,23 @@ nfa_regexec_both( #endif theend: + // Make sure the end is never before the start. Can happen when \zs and + // \ze are used. + if (REG_MULTI) + { + lpos_T *start = &rex.reg_mmatch->startpos[0]; + lpos_T *end = &rex.reg_mmatch->endpos[0]; + + if (end->lnum < start->lnum + || (end->lnum == start->lnum && end->col < start->col)) + rex.reg_mmatch->endpos[0] = rex.reg_mmatch->startpos[0]; + } + else + { + if (rex.reg_match->endp[0] < rex.reg_match->startp[0]) + rex.reg_match->endp[0] = rex.reg_match->startp[0]; + } + return retval; }
--- a/src/testdir/test_regexp_latin.vim +++ b/src/testdir/test_regexp_latin.vim @@ -911,6 +911,13 @@ func Test_start_end_of_buffer_match() bwipe! endfunc +func Test_ze_before_zs() + call assert_equal('', matchstr(' ', '\%#=1\ze \zs')) + call assert_equal('', matchstr(' ', '\%#=2\ze \zs')) + call assert_equal(repeat([''], 10), matchlist(' ', '\%#=1\ze \zs')) + call assert_equal(repeat([''], 10), matchlist(' ', '\%#=2\ze \zs')) +endfunc + " Check for detecting error func Test_regexp_error() call assert_fails("call matchlist('x x', '\\%#=1 \\zs*')", 'E888:')