thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

updated for version 7.4.021

Browse Source 
Problem:    NFA regexp: Using \ze in one branch which doesn't match may cause
            end of another branch to be wrong. (William Fugh)
Solution:   Set end position if it wasn't set yet.
This commit is contained in:
Bram Moolenaar
2013-09-05 21:15:44 +02:00
parent 78c93e4b6a
commit 9be4481892
4 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/regexp_nfa.c
View File

@@ -4209,10 +4209,11 @@ skip_add:
break;
case NFA_MCLOSE:
if (nfa_has_zend)
if (nfa_has_zend && (REG_MULTI
? subs->norm.list.multi[0].end.lnum >= 0
: subs->norm.list.line[0].end != NULL))
{
/* Do not overwrite the position set by \ze. If no \ze
* encountered end will be set in nfa_regtry(). */
/* Do not overwrite the position set by \ze. */
subs = addstate(l, state->out, subs, pim, off);
break;
}