patch 8.0.0248: vim_strcat() cannot handle overlapping arguments
Problem: vim_strcat() cannot handle overlapping arguments.
Solution: Use mch_memmove() instead of strcpy(). (Justin M Keyes,
closes #1415)
diff --git a/src/misc2.c b/src/misc2.c
index 9c39d40..71ca6d8 100644
--- a/src/misc2.c
+++ b/src/misc2.c
@@ -1719,7 +1719,7 @@
/*
* Like strcat(), but make sure the result fits in "tosize" bytes and is
- * always NUL terminated.
+ * always NUL terminated. "from" and "to" may overlap.
*/
void
vim_strcat(char_u *to, char_u *from, size_t tosize)
@@ -1733,7 +1733,7 @@
to[tosize - 1] = NUL;
}
else
- STRCPY(to + tolen, from);
+ mch_memmove(to + tolen, from, fromlen + 1);
}
/*
diff --git a/src/version.c b/src/version.c
index 199c37d..1125992 100644
--- a/src/version.c
+++ b/src/version.c
@@ -765,6 +765,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 248,
+/**/
247,
/**/
246,