From: Bram Moolenaar <Bram@vim.org>
Date: Mon, 4 May 2015 07:56:49 +0000 (+0200)
Subject: patch 7.4.714
X-Git-Tag: v7.4.714
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=069dd08d8dbbbadc4e6780d5c881a24bce79a4f7;p=vim

patch 7.4.714
Problem:    Illegal memory access when there are illegal bytes.
Solution:   Check the byte length of the character. (Dominique Pelle)
---

diff --git a/src/regexp.c b/src/regexp.c
index 6ae05f8f9..85e0458de 100644
--- a/src/regexp.c
+++ b/src/regexp.c
@@ -6113,7 +6113,7 @@ do_class:
 	    {
 		if (ireg_ic && enc_utf8)
 		    cf = utf_fold(utf_ptr2char(opnd));
-		while (count < maxcount)
+		while (count < maxcount && (*mb_ptr2len)(scan) >= len)
 		{
 		    for (i = 0; i < len; ++i)
 			if (opnd[i] != scan[i])
diff --git a/src/version.c b/src/version.c
index 4097dac09..8f994cd79 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 */
+/**/
+    714,
 /**/
     713,
 /**/