diff options
| -rw-r--r-- | src/misc2.c | 23 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 13 insertions, 12 deletions
diff --git a/src/misc2.c b/src/misc2.c index 4f821178f..6ac1e5fa5 100644 --- a/src/misc2.c +++ b/src/misc2.c @@ -4369,21 +4369,20 @@ vim_findfile_init(path, filename, stopdirs, level, free_visited, find_what, 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); + vim_free(wc_path); + goto error_return; + } - if (temp == NULL || wc_path == NULL) - { - vim_free(buf); - vim_free(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); - 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); diff --git a/src/version.c b/src/version.c index 8d782620d..f31f1bd1c 100644 --- a/src/version.c +++ b/src/version.c @@ -742,6 +742,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 885, +/**/ 884, /**/ 883, |