summaryrefslogtreecommitdiff
path: root/dir.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-02-05 14:54:08 -0800
committerJunio C Hamano <gitster@pobox.com>2016-02-05 14:54:08 -0800
commitaf3e464a60d43ebf0431aa291014d32983a502e2 (patch)
tree94e590591ad14a98e1e301b1a31f61827e38d46f /dir.c
parentd6998341d8806a1625d375025fecb95346b7dd6d (diff)
parent2653a8c6fa0466828061a3132421cf13a5d6d924 (diff)
downloadgit-af3e464a60d43ebf0431aa291014d32983a502e2.tar.gz
Merge branch 'nd/dir-exclude-cleanup' into maint
The "exclude_list" structure has the usual "alloc, nr" pair of fields to be used by ALLOC_GROW(), but clear_exclude_list() forgot to reset 'alloc' to 0 when it cleared 'nr' to discard the managed array. * nd/dir-exclude-cleanup: dir.c: clean the entire struct in clear_exclude_list()
Diffstat (limited to 'dir.c')
-rw-r--r--dir.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/dir.c b/dir.c
index d2a8f06b02..b8b4576cd2 100644
--- a/dir.c
+++ b/dir.c
@@ -564,9 +564,7 @@ void clear_exclude_list(struct exclude_list *el)
free(el->excludes);
free(el->filebuf);
- el->nr = 0;
- el->excludes = NULL;
- el->filebuf = NULL;
+ memset(el, 0, sizeof(*el));
}
static void trim_trailing_spaces(char *buf)