summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/search.c15
-rw-r--r--src/version.c2
2 files changed, 12 insertions, 5 deletions
diff --git a/src/search.c b/src/search.c
index 864bfe3b80..20bf399b20 100644
--- a/src/search.c
+++ b/src/search.c
@@ -5198,11 +5198,16 @@ fuzzy_match_str_with_pos(char_u *str UNUSED, char_u *pat UNUSED)
cleanup:
vim_free(tv_str.vval.v_string);
- list_free(match_str_list);
- list_free(match_pos_list);
- list_free(match_score_list);
- list_free(retlist);
- list_free(l);
+ if (match_str_list != NULL)
+ list_free(match_str_list);
+ if (match_pos_list != NULL)
+ list_free(match_pos_list);
+ if (match_score_list != NULL)
+ list_free(match_score_list);
+ if (retlist != NULL)
+ list_free(retlist);
+ if (l != NULL)
+ list_free(l);
ga_clear(match_positions);
return NULL;
#else
diff --git a/src/version.c b/src/version.c
index cc2494521d..4b695c01e2 100644
--- a/src/version.c
+++ b/src/version.c
@@ -705,6 +705,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 478,
+/**/
477,
/**/
476,