Mercurial > vim
changeset 3202:e757e1127d21 v7.3.371
updated for version 7.3.371
Problem: Crash in autocomplete. (Greg Weber)
Solution: Check not going over allocated buffer size.
| author | Bram Moolenaar <bram@vim.org> |
|---|---|
| date | Thu, 08 Dec 2011 17:49:35 +0100 |
| parents | afdc99e393fc |
| children | 7d79dd9941da |
| files | src/misc2.c src/version.c |
| diffstat | 2 files changed, 15 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/misc2.c +++ b/src/misc2.c @@ -4293,6 +4293,8 @@ static ff_stack_T *ff_create_stack_eleme static int ff_path_in_stoplist __ARGS((char_u *, int, char_u **)); #endif +static char_u e_pathtoolong[] = N_("E854: path too long for completion"); + #if 0 /* * if someone likes findfirst/findnext, here are the functions @@ -4589,6 +4591,11 @@ vim_findfile_init(path, filename, stopdi len = 0; while (*wc_part != NUL) { + if (len + 5 >= MAXPATHL) + { + EMSG(_(e_pathtoolong)); + break; + } if (STRNCMP(wc_part, "**", 2) == 0) { ff_expand_buffer[len++] = *wc_part++; @@ -4634,6 +4641,12 @@ vim_findfile_init(path, filename, stopdi } /* create an absolute path */ + if (STRLEN(search_ctx->ffsc_start_dir) + + STRLEN(search_ctx->ffsc_fix_path) + 3 >= MAXPATHL) + { + EMSG(_(e_pathtoolong)); + goto error_return; + } STRCPY(ff_expand_buffer, search_ctx->ffsc_start_dir); add_pathsep(ff_expand_buffer); STRCAT(ff_expand_buffer, search_ctx->ffsc_fix_path);