# [PATCH] wt-status.c: don't leak directory entries when processing untracked,ignored 2 messages from 2010-09-27 to 2010-09-27. Participants: Brandon Casey, Junio C Hamano. Thread: https://gitlist.dev/t/25254 ## Brandon Casey, 2010-09-27 02:49 Subject: [PATCH] wt-status.c: don't leak directory entries when processing untracked,ignored Message-ID: <1285555753-15858-1-git-send-email-drafnel@gmail.com> URL: https://gitlist.dev/e/1285555753-15858-1-git-send-email-drafnel%40gmail.com ``` When iterating through the list of directory entries, searching for untracked entries, only the entries added to the string_list were free'd. The rest (tracked or not matching the pathspec) were leaked. Ditto for the "ignored" loop. Rearrange the loops so that all entries are free'd. Signed-off-by: Brandon Casey --- wt-status.c | 16 ++++++---------- 1 files changed, 6 insertions(+), 10 deletions(-) diff --git a/wt-status.c b/wt-status.c index 54b6b03..fc2438f 100644 --- a/wt-status.c +++ b/wt-status.c @@ -390,11 +390,9 @@ static void wt_status_collect_untracked(struct wt_status *s) fill_directory(&dir, s->pathspec); for (i = 0; i < dir.nr; i++) { struct dir_entry *ent = dir.entries[i]; - if (!cache_name_is_other(ent->name, ent->len)) - continue; - if (!match_pathspec(s->pathspec, ent->name, ent->len, 0, NULL)) - continue; - string_list_insert(&s->untracked, ent->name); + if (cache_name_is_other(ent->name, ent->len) && + match_pathspec(s->pathspec, ent->name, ent->len, 0, NULL)) + string_list_insert(&s->untracked, ent->name); free(ent); } @@ -404,11 +402,9 @@ static void wt_status_collect_untracked(struct wt_status *s) fill_directory(&dir, s->pathspec); for (i = 0; i < dir.nr; i++) { struct dir_entry *ent = dir.entries[i]; - if (!cache_name_is_other(ent->name, ent->len)) - continue; - if (!match_pathspec(s->pathspec, ent->name, ent->len, 0, NULL)) - continue; - string_list_insert(&s->ignored, ent->name); + if (cache_name_is_other(ent->name, ent->len) && + match_pathspec(s->pathspec, ent->name, ent->len, 0, NULL)) + string_list_insert(&s->ignored, ent->name); free(ent); } } -- 1.7.3.1.geb284 ``` ## Junio C Hamano, 2010-09-27 22:19 Subject: Re: [PATCH] wt-status.c: don't leak directory entries when processing untracked,ignored Message-ID: <7vmxr2x213.fsf@alter.siamese.dyndns.org> URL: https://gitlist.dev/e/7vmxr2x213.fsf%40alter.siamese.dyndns.org In-Reply-To: <1285555753-15858-1-git-send-email-drafnel@gmail.com> ``` Thanks. ```