aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-10-06 05:44:14 -04:00
Code Activity

patch 8.0.0248: vim_strcat() cannot handle overlapping arguments

Browse Source 
Problem:    vim_strcat() cannot handle overlapping arguments.
Solution:   Use mch_memmove() instead of strcpy(). (Justin M Keyes,
            closes #1415)
This commit is contained in:
Bram Moolenaar
2017-01-27 21:54:07 +01:00
parent aed6d0b81a
commit 45600ce8f2
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/misc2.c
View File

@@ -1719,7 +1719,7 @@ vim_strncpy(char_u *to, char_u *from, size_t len)
/* /*
* Like strcat(), but make sure the result fits in "tosize" bytes and is * 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 void
vim_strcat(char_u *to, char_u *from, size_t tosize) vim_strcat(char_u *to, char_u *from, size_t tosize)
@@ -1733,7 +1733,7 @@ vim_strcat(char_u *to, char_u *from, size_t tosize)
to[tosize - 1] = NUL; to[tosize - 1] = NUL;
} }
else else
STRCPY(to + tolen, from); mch_memmove(to + tolen, from, fromlen + 1);
} }
/* /*

2
src/version.c
View File

@@ -764,6 +764,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
248,
/**/ /**/
247, 247,
/**/ /**/