diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-08-24 14:54:33 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-08-24 14:54:34 -0700 |
| commit | ad00f44f5479441da59bd55261ae717fcb357938 (patch) | |
| tree | 68f77a1bfd9deb6b5a88b937e27ab5e5b7400e59 /builtin/check-ignore.c | |
| parent | 51226147d16d59243957cb3bc1b2313f9f740725 (diff) | |
| parent | eceba5321410bbcc9e0b11e6aa479832f574eca8 (diff) | |
| download | git-ad00f44f5479441da59bd55261ae717fcb357938.tar.gz | |
Merge branch 'en/dir-clear'
Leakfix with code clean-up.
* en/dir-clear:
dir: fix problematic API to avoid memory leaks
dir: make clear_directory() free all relevant memory
Diffstat (limited to 'builtin/check-ignore.c')
| -rw-r--r-- | builtin/check-ignore.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/check-ignore.c b/builtin/check-ignore.c index ea5d0ae3a6..3c652748d5 100644 --- a/builtin/check-ignore.c +++ b/builtin/check-ignore.c @@ -180,7 +180,7 @@ int cmd_check_ignore(int argc, const char **argv, const char *prefix) if (!no_index && read_cache() < 0) die(_("index file corrupt")); - memset(&dir, 0, sizeof(dir)); + dir_init(&dir); setup_standard_excludes(&dir); if (stdin_paths) { @@ -190,7 +190,7 @@ int cmd_check_ignore(int argc, const char **argv, const char *prefix) maybe_flush_or_die(stdout, "ignore to stdout"); } - clear_directory(&dir); + dir_clear(&dir); return !num_ignored; } |