From 7c57940e3bd883cebb1d73d4b4effa9220d4c4c8 Mon Sep 17 00:00:00 2001 From: glepnir Date: Wed, 12 Jun 2024 20:31:13 +0200 Subject: [PATCH] patch 9.1.0478: potential deref of NULL pointer in fuzzy_match_str_with_pos Problem: potential deref of NULL pointer in fuzzy_match_str_with_pos() on cleanup (after v9.1.0476) Solution: Only free the pointer if it is non-NULL (glepnir) closes: #14973 Signed-off-by: glepnir Signed-off-by: Christian Brabandt --- src/search.c | 15 ++++++++++----- src/version.c | 2 ++ 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 @@ -704,6 +704,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 478, /**/ 477, /**/