From: Bram Moolenaar <Bram@vim.org>
Date: Sun, 6 Apr 2014 19:34:04 +0000 (+0200)
Subject: updated for version 7.4.253
X-Git-Tag: v7.4.253
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5a4e160ce423f56456227c3d7d8d8a069120b377;p=vim

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 0a590f66d..2c364b30b 100644
--- a/src/regexp.c
+++ b/src/regexp.c
@@ -4146,7 +4146,8 @@ regtry(prog, col)
 	    {
 		/* 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 afcbed474..79b7612bd 100644
--- a/src/regexp_nfa.c
+++ b/src/regexp_nfa.c
@@ -6781,8 +6781,10 @@ nfa_regtry(prog, col)
 	    {
 		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 f0ef62c7e..365ee5a94 100644
--- a/src/version.c
+++ b/src/version.c
@@ -734,6 +734,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    253,
 /**/
     252,
 /**/