зеркало из https://github.com/microsoft/git.git
path-list.c: always free strdup'ed paths
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:
Родитель
6ed77266c6
Коммит
79d722224d
14
path-list.c
14
path-list.c
|
@ -76,16 +76,18 @@ struct path_list_item *path_list_lookup(const char *path, struct path_list *list
|
|||
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) {
|
||||
int i;
|
||||
if (free_items)
|
||||
for (i = 0; i < list->nr; i++) {
|
||||
if (list->strdup_paths)
|
||||
free(list->items[i].path);
|
||||
if (list->strdup_paths) {
|
||||
for (i = 0; i < list->nr; i++)
|
||||
free(list->items[i].path);
|
||||
}
|
||||
if (free_util) {
|
||||
for (i = 0; i < list->nr; i++)
|
||||
free(list->items[i].util);
|
||||
}
|
||||
}
|
||||
free(list->items);
|
||||
}
|
||||
list->items = NULL;
|
||||
|
|
|
@ -15,7 +15,7 @@ struct path_list
|
|||
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);
|
||||
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_lookup(const char *path, struct path_list *list);
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче