vim-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 vim/vim#7442)
a7a691cc14
This commit is contained in:
Sean Dewar
2020-12-09 18:53:55 +00:00
parent bfed67e00e
commit b8a0304bb9
3 changed files with 39 additions and 0 deletions

View File

@@ -6591,6 +6591,22 @@ static long nfa_regexec_both(char_u *line, colnr_T startcol,
#endif
theend:
// Make sure the end is never before the start. Can happen when \zs and
// \ze are used.
if (REG_MULTI) {
const lpos_T *const start = &rex.reg_mmatch->startpos[0];
const lpos_T *const 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;
}