From: Bram Moolenaar <Bram@vim.org>
Date: Tue, 31 Mar 2015 12:17:31 +0000 (+0200)
Subject: updated for version 7.4.685
X-Git-Tag: v7.4.685
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0e462411cafdd908356792b2c229ab6369103bca;p=vim

updated for version 7.4.685
Problem:    When there are illegal utf-8 characters the old regexp engine may
            go past the end of a string.
Solution:   Only advance to the end of the string. (Dominique Pelle)
---

diff --git a/src/regexp.c b/src/regexp.c
index bae547cd6..961796be5 100644
--- a/src/regexp.c
+++ b/src/regexp.c
@@ -4782,7 +4782,8 @@ regmatch(scan)
 		    /* When only a composing char is given match at any
 		     * position where that composing char appears. */
 		    status = RA_NOMATCH;
-		    for (i = 0; reginput[i] != NUL; i += utf_char2len(inpc))
+		    for (i = 0; reginput[i] != NUL;
+						i += utf_ptr2len(reginput + i))
 		    {
 			inpc = mb_ptr2char(reginput + i);
 			if (!utf_iscomposing(inpc))
diff --git a/src/version.c b/src/version.c
index f4ed01a64..6156c3731 100644
--- 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 */
+/**/
+    685,
 /**/
     684,
 /**/