commit e90c853ff6dcef63bff80be0e7379a80c276af8f
author Bram Moolenaar <Bram@vim.org> Wed Nov 05 16:03:44 2014 +0100
committer Bram Moolenaar <Bram@vim.org> Wed Nov 05 16:03:44 2014 +0100
tree a4cf516c33cd66d8b819134247854545a2b331c8
parent 9c7d98d7c2b81e6e0b4d45389c56fc0e922a5bfe

updated for version 7.4.499
Problem:    substitute() can be slow with long strings.
Solution:   Store a pointer to the end, instead of calling strlen() every
            time. (Ozaki Kiichi)

src/eval.c

diff --git a/src/eval.c b/src/eval.c
index f5aa7e9..ecc5e3a 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -25076,6 +25076,7 @@
     int		i;
     int		do_all;
     char_u	*tail;
+    char_u	*end;
     garray_T	ga;
     char_u	*ret;
     char_u	*save_cpo;
@@ -25094,6 +25095,7 @@
     if (regmatch.regprog != NULL)
     {
 	tail = str;
+	end = str + STRLEN(str);
 	while (vim_regexec_nl(&regmatch, str, (colnr_T)(tail - str)))
 	{
 	    /* Skip empty match except for first match. */
@@ -25120,7 +25122,7 @@
 	     * - The text after the match.
 	     */
 	    sublen = vim_regsub(&regmatch, sub, tail, FALSE, TRUE, FALSE);
-	    if (ga_grow(&ga, (int)(STRLEN(tail) + sublen -
+	    if (ga_grow(&ga, (int)((end - tail) + sublen -
 			    (regmatch.endp[0] - regmatch.startp[0]))) == FAIL)
 	    {
 		ga_clear(&ga);

src/version.c

diff --git a/src/version.c b/src/version.c
index ae1a56b..9008518 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    499,
+/**/
     498,
 /**/
     497,