diff --git a/src/misc2.c b/src/misc2.c
index c63344f..bc15808 100644
--- a/src/misc2.c
+++ b/src/misc2.c
@@ -4680,11 +4680,11 @@
     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 ea51c18..b9309af 100644
--- a/src/version.c
+++ b/src/version.c
@@ -729,6 +729,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1298,
+/**/
     1297,
 /**/
     1296,