diff options
| author | Bram Moolenaar <Bram@vim.org> | 2013-07-03 17:51:17 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2013-07-03 17:51:17 +0200 |
| commit | 0f5a5ed8bb3c014ef9de0480852a3e5737c33fc6 (patch) | |
| tree | d268f8ab82ae455ad78eb1a23b411775daa66103 | |
| parent | f4c5fcb3ad0b98d6827d5f95e5c66cdd54e66a02 (diff) | |
| download | vim-0f5a5ed8bb3c014ef9de0480852a3e5737c33fc6.zip | |
updated for version 7.3.1298
Problem: Crash.
Solution: Use STRCPY() instead of STRCAT() and allocate one more byte.
| -rw-r--r-- | src/misc2.c | 6 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 5 insertions, 3 deletions
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 @@ -729,6 +729,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1298, +/**/ 1297, /**/ 1296, |