aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/regexp_nfa.c
diff options
context:
space:
mode:
authorSean Dewar <seandewar@users.noreply.github.com>2020-12-09 18:53:55 +0000
committerSean Dewar <seandewar@users.noreply.github.com>2020-12-09 19:02:57 +0000
commitb8a0304bb90cf1725cff78cd59521c417f36e5f4 (patch)
tree04dc790409943eb52bb1c59371925e6ca186cf35 /src/nvim/regexp_nfa.c
parentbfed67e00ecdf71e0c7d17b1fd802f223b42c800 (diff)
downloadrneovim-b8a0304bb90cf1725cff78cd59521c417f36e5f4.tar.gz
rneovim-b8a0304bb90cf1725cff78cd59521c417f36e5f4.tar.bz2
rneovim-b8a0304bb90cf1725cff78cd59521c417f36e5f4.zip
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) https://github.com/vim/vim/commit/a7a691cc142439e266f4ceb1f208bb952b57aa71
Diffstat (limited to 'src/nvim/regexp_nfa.c')
-rw-r--r--src/nvim/regexp_nfa.c16
1 files changed, 16 insertions, 0 deletions
diff --git a/src/nvim/regexp_nfa.c b/src/nvim/regexp_nfa.c
index 7dfd16fb4f..137b2304c0 100644
--- a/src/nvim/regexp_nfa.c
+++ b/src/nvim/regexp_nfa.c
@@ -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;
}