updated for version 7.4.253
Problem: Crash when using cpp syntax file with pattern using external
match. (Havard Garnes)
Solution: Discard match when end column is before start column.
diff --git a/src/regexp.c b/src/regexp.c
index 0a590f6..2c364b3 100644
--- a/src/regexp.c
+++ b/src/regexp.c
@@ -4146,7 +4146,8 @@
{
/* Only accept single line matches. */
if (reg_startzpos[i].lnum >= 0
- && reg_endzpos[i].lnum == reg_startzpos[i].lnum)
+ && reg_endzpos[i].lnum == reg_startzpos[i].lnum
+ && reg_endzpos[i].col >= reg_startzpos[i].col)
re_extmatch_out->matches[i] =
vim_strnsave(reg_getline(reg_startzpos[i].lnum)
+ reg_startzpos[i].col,
diff --git a/src/regexp_nfa.c b/src/regexp_nfa.c
index afcbed4..79b7612 100644
--- a/src/regexp_nfa.c
+++ b/src/regexp_nfa.c
@@ -6781,8 +6781,10 @@
{
struct multipos *mpos = &subs.synt.list.multi[i];
- /* Only accept single line matches. */
- if (mpos->start.lnum >= 0 && mpos->start.lnum == mpos->end.lnum)
+ /* Only accept single line matches that are valid. */
+ if (mpos->start.lnum >= 0
+ && mpos->start.lnum == mpos->end.lnum
+ && mpos->end.col >= mpos->start.col)
re_extmatch_out->matches[i] =
vim_strnsave(reg_getline(mpos->start.lnum)
+ mpos->start.col,
diff --git a/src/version.c b/src/version.c
index f0ef62c..365ee5a 100644
--- a/src/version.c
+++ b/src/version.c
@@ -735,6 +735,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 253,
+/**/
252,
/**/
251,
