updated for version 7.4.528

Problem:    Crash when using matchadd() (Yasuhiro Matsumoto)
Solution:   Copy the match regprog.

diff --git a/src/screen.c b/src/screen.c
index e11bdc37752eac062d6c26c1ab4c37743e84bc0a..d3951386282a2e5be242ae445d7f5b5fe82e6d51 100644 (file)
--- a/src/screen.c
+++ b/src/screen.c
@@ -7588,6 +7588,12 @@ next_search_hl(win, shl, lnum, mincol, cur)
        shl->lnum = lnum;
        if (shl->rm.regprog != NULL)
        {
+           /* Remember whether shl->rm is using a copy of the regprog in
+            * cur->match. */
+           int regprog_is_copy = (shl != &search_hl && cur != NULL
+                               && shl == &cur->hl
+                               && cur->match.regprog == cur->hl.rm.regprog);
+
            nmatched = vim_regexec_multi(&shl->rm, win, shl->buf, lnum,
                    matchcol,
 #ifdef FEAT_RELTIME
@@ -7596,6 +7602,10 @@ next_search_hl(win, shl, lnum, mincol, cur)
                    NULL
 #endif
                    );
+           /* Copy the regprog, in case it got freed and recompiled. */
+           if (regprog_is_copy)
+               cur->match.regprog = cur->hl.rm.regprog;
+
            if (called_emsg || got_int)
            {
                /* Error while handling regexp: stop using this regexp. */

diff --git a/src/version.c b/src/version.c
index a3adca86a4cac25967e7ad15e665db8a3b86c188..c674ce19178bd8e0dcf76547b8ab208d0d428474 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    528,
 /**/
     527,
 /**/