From: Bram Moolenaar <Bram@vim.org>
Date: Sat, 21 Jun 2008 14:30:28 +0000 (+0000)
Subject: updated for version 7.1-330
X-Git-Tag: v7.1.330
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=176dd1e03c7e5f23e633705da2c8718d3cd320e1;p=vim

updated for version 7.1-330
---

diff --git a/src/misc1.c b/src/misc1.c
index f621a8949..1992cf997 100644
--- a/src/misc1.c
+++ b/src/misc1.c
@@ -1880,15 +1880,20 @@ ins_bytes_len(p, len)
 # ifdef FEAT_MBYTE
     int		n;
 
-    for (i = 0; i < len; i += n)
-    {
-	n = (*mb_ptr2len)(p + i);
-	ins_char_bytes(p + i, n);
-    }
-# else
-    for (i = 0; i < len; ++i)
-	ins_char(p[i]);
+    if (has_mbyte)
+	for (i = 0; i < len; i += n)
+	{
+	    if (enc_utf8)
+		/* avoid reading past p[len] */
+		n = utfc_ptr2len_len(p + i, len - i);
+	    else
+		n = (*mb_ptr2len)(p + i);
+	    ins_char_bytes(p + i, n);
+	}
+    else
 # endif
+	for (i = 0; i < len; ++i)
+	    ins_char(p[i]);
 }
 #endif
 
diff --git a/src/version.c b/src/version.c
index f9b88868e..5d1958485 100644
--- a/src/version.c
+++ b/src/version.c
@@ -666,6 +666,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    330,
 /**/
     329,
 /**/