diff options
| author | Bram Moolenaar <Bram@vim.org> | 2010-07-24 16:01:56 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2010-07-24 16:01:56 +0200 |
| commit | b31e4383cd027e3aaf60451d9efaac7de7608b76 (patch) | |
| tree | b712ef8a0f31bac7fe1f74fc11f882b1f4611b44 /src | |
| parent | 4f99eae08202f8d740f8f7b70fce498773a634b6 (diff) | |
Fix memory leak in :find completion. (Dominique Pelle)
Diffstat (limited to 'src')
| -rw-r--r-- | src/misc1.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/misc1.c b/src/misc1.c index 8e2c656e21..fb04fb6b72 100644 --- a/src/misc1.c +++ b/src/misc1.c @@ -9306,7 +9306,7 @@ is_unique(maybe_unique, gap, i) } /* - * Remove adjecent duplicate entries from "gap", which is a list of file names + * Remove adjacent duplicate entries from "gap", which is a list of file names * in allocated memory. */ static void @@ -9354,7 +9354,7 @@ uniquefy_paths(gap, pattern) /* * We need to prepend a '*' at the beginning of file_pattern so that the * regex matches anywhere in the path. FIXME: is this valid for all - * possible pattern? + * possible patterns? */ len = (int)STRLEN(pattern); file_pattern = alloc(len + 2); @@ -9363,14 +9363,13 @@ uniquefy_paths(gap, pattern) STRCAT(file_pattern, pattern); pat = file_pat_to_reg_pat(file_pattern, NULL, NULL, TRUE); vim_free(file_pattern); - regmatch.rm_ic = TRUE; /* always ignore case */ + if (pat == NULL) + return; - if (pat != NULL) - { - regmatch.regprog = vim_regcomp(pat, RE_MAGIC + RE_STRING); - vim_free(pat); - } - if (pat == NULL || regmatch.regprog == NULL) + regmatch.rm_ic = TRUE; /* always ignore case */ + regmatch.regprog = vim_regcomp(pat, RE_MAGIC + RE_STRING); + vim_free(pat); + if (regmatch.regprog == NULL) return; for (i = 0; i < gap->ga_len; i++) @@ -9391,6 +9390,7 @@ uniquefy_paths(gap, pattern) } } + vim_free(regmatch.regprog); if (sort_again) { sort_strings(fnames, gap->ga_len); |