From: Bram Moolenaar <Bram@vim.org>
Date: Wed, 3 Jul 2013 15:51:17 +0000 (+0200)
Subject: updated for version 7.3.1298
X-Git-Tag: v7.3.1298
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0f5a5ed8bb3c014ef9de0480852a3e5737c33fc6;p=vim

updated for version 7.3.1298
Problem:    Crash.
Solution:   Use STRCPY() instead of STRCAT() and allocate one more byte.
---

diff --git a/src/misc2.c b/src/misc2.c
index c63344f0d..bc1580888 100644
--- a/src/misc2.c
+++ b/src/misc2.c
@@ -4680,11 +4680,11 @@ vim_findfile_init(path, filename, stopdirs, level, free_visited, find_what,
     STRCPY(ff_expand_buffer, search_ctx->ffsc_start_dir);
     add_pathsep(ff_expand_buffer);
     {
-	char_u *buf = alloc(STRLEN(ff_expand_buffer)
-					 + STRLEN(search_ctx->ffsc_fix_path));
+	int    eb_len = STRLEN(ff_expand_buffer);
+	char_u *buf = alloc(eb_len + STRLEN(search_ctx->ffsc_fix_path) + 1);
 
 	STRCPY(buf, ff_expand_buffer);
-	STRCAT(buf, search_ctx->ffsc_fix_path);
+	STRCPY(buf + eb_len, search_ctx->ffsc_fix_path);
 	if (mch_isdir(buf))
 	{
 	    STRCAT(ff_expand_buffer, search_ctx->ffsc_fix_path);
diff --git a/src/version.c b/src/version.c
index ea51c1847..b9309af3d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -728,6 +728,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1298,
 /**/
     1297,
 /**/