Mercurial > vim
changeset 7148:339e657a6ed6 v7.4.885
commit https://github.com/vim/vim/commit/c79a5452acd695238798947e40086f9823c400e7
Author: Bram Moolenaar <Bram@vim.org>
Date: Tue Sep 29 12:08:42 2015 +0200
patch 7.4.885
Problem: When doing an upwards search without wildcards the search fails if
the initial directory doesn't exist.
Solution: Fix the non-wildcard case. (Stefan Kempf)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Tue, 29 Sep 2015 12:15:04 +0200 |
| parents | c590de398af9 |
| children | bc2327686917 |
| files | src/misc2.c src/version.c |
| diffstat | 2 files changed, 14 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/src/misc2.c +++ b/src/misc2.c @@ -4369,21 +4369,20 @@ vim_findfile_init(path, filename, stopdi temp = alloc((int)(STRLEN(search_ctx->ffsc_wc_path) + STRLEN(search_ctx->ffsc_fix_path + len) + 1)); - } - - if (temp == NULL || wc_path == NULL) - { - vim_free(buf); - vim_free(temp); + if (temp == NULL || wc_path == NULL) + { + vim_free(buf); + vim_free(temp); + vim_free(wc_path); + goto error_return; + } + + STRCPY(temp, search_ctx->ffsc_fix_path + len); + STRCAT(temp, search_ctx->ffsc_wc_path); + vim_free(search_ctx->ffsc_wc_path); vim_free(wc_path); - goto error_return; + search_ctx->ffsc_wc_path = temp; } - - STRCPY(temp, search_ctx->ffsc_fix_path + len); - STRCAT(temp, search_ctx->ffsc_wc_path); - vim_free(search_ctx->ffsc_wc_path); - vim_free(wc_path); - search_ctx->ffsc_wc_path = temp; } #endif vim_free(buf);