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 0a590f66d7f02a1a264f9a93b6c084178bf1c0b8..2c364b30be9f9ca54ba35665eeeb1fdd85e6f30f 100644 (file)
--- 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 afcbed474ec388f6d683c94f5dd18e3dda09df9f..79b7612bd91236507fb3c107a949bbf233c35b9b 100644 (file)
--- 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 f0ef62c7e212ace67ae7da5039de119cb930f679..365ee5a94565b52ef76582c214a9d6b8b49b87a0 100644 (file)
--- 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,
 /**/