summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/misc2.c15
-rw-r--r--src/version.c2
2 files changed, 17 insertions, 0 deletions
diff --git a/src/misc2.c b/src/misc2.c
index ca8f56d38..df3f8e169 100644
--- a/src/misc2.c
+++ b/src/misc2.c
@@ -4657,7 +4657,10 @@ vim_findfile(void *search_ctx_arg)
add_pathsep(file_path);
}
else
+ {
+ ff_free_stack_element(stackp);
goto fail;
+ }
}
/* append the fix part of the search path */
@@ -4667,7 +4670,10 @@ vim_findfile(void *search_ctx_arg)
add_pathsep(file_path);
}
else
+ {
+ ff_free_stack_element(stackp);
goto fail;
+ }
#ifdef FEAT_PATH_EXTRA
rest_of_wildcards = stackp->ffs_wc_path;
@@ -4687,7 +4693,10 @@ vim_findfile(void *search_ctx_arg)
if (len + 1 < MAXPATHL)
file_path[len++] = '*';
else
+ {
+ ff_free_stack_element(stackp);
goto fail;
+ }
}
if (*p == 0)
@@ -4718,7 +4727,10 @@ vim_findfile(void *search_ctx_arg)
if (len + 1 < MAXPATHL)
file_path[len++] = *rest_of_wildcards++;
else
+ {
+ ff_free_stack_element(stackp);
goto fail;
+ }
file_path[len] = NUL;
if (vim_ispathsep(*rest_of_wildcards))
@@ -4787,7 +4799,10 @@ vim_findfile(void *search_ctx_arg)
STRCAT(file_path, search_ctx->ffsc_file_to_search);
}
else
+ {
+ ff_free_stack_element(stackp);
goto fail;
+ }
/*
* Try without extra suffix and then with suffixes
diff --git a/src/version.c b/src/version.c
index c8bb2f7de..e78fde7df 100644
--- a/src/version.c
+++ b/src/version.c
@@ -784,6 +784,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 843,
+/**/
842,
/**/
841,