undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

path-list.c: always free strdup'ed paths

Browse Source 
Always free .paths if .strdup_paths is set, no matter if the
parameter free_items is set or not, plugging a minor memory leak.
And to clarify the meaning of the flag, rename it to free_util,
since it now only affects the freeing of the .util field.

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
René Scharfe 2007-08-15 17:59:24 +02:00 committed by Junio C Hamano
parent 6ed77266c6
commit 79d722224d
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
path-list.c
View File

@ -76,16 +76,18 @@ struct path_list_item *path_list_lookup(const char *path, struct path_list *list
return list->items + i; return list->items + i;
} }
void path_list_clear(struct path_list *list, int free_items) void path_list_clear(struct path_list *list, int free_util)
{ {
if (list->items) { if (list->items) {
int i; int i;
if (free_items) if (list->strdup_paths) {
for (i = 0; i < list->nr; i++) { for (i = 0; i < list->nr; i++)
if (list->strdup_paths) free(list->items[i].path);
free(list->items[i].path); }
if (free_util) {
for (i = 0; i < list->nr; i++)
free(list->items[i].util); free(list->items[i].util);
} }
free(list->items); free(list->items);
} }
list->items = NULL; list->items = NULL;

2
path-list.h
View File

@ -15,7 +15,7 @@ struct path_list
void print_path_list(const char *text, const struct path_list *p); void print_path_list(const char *text, const struct path_list *p);
int path_list_has_path(const struct path_list *list, const char *path); int path_list_has_path(const struct path_list *list, const char *path);
void path_list_clear(struct path_list *list, int free_items); void path_list_clear(struct path_list *list, int free_util);
struct path_list_item *path_list_insert(const char *path, struct path_list *list); struct path_list_item *path_list_insert(const char *path, struct path_list *list);
struct path_list_item *path_list_lookup(const char *path, struct path_list *list); struct path_list_item *path_list_lookup(const char *path, struct path_list *list);