From aa4d3298fb6d46bec3d8996ff8c7ec8c9cc50db9 Mon Sep 17 00:00:00 2001 From: Andrew Gregory Date: Mon, 6 Jan 2014 11:52:26 -0500 Subject: table_display: free memory on errors Signed-off-by: Andrew Gregory Signed-off-by: Allan McRae --- src/pacman/util.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'src/pacman/util.c') diff --git a/src/pacman/util.c b/src/pacman/util.c index d7a5e01f..91f8fb3b 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -587,9 +587,10 @@ static int table_display(const alpm_list_t *header, const alpm_list_t *i, *first; size_t *widths = NULL, totalcols, totalwidth; int *has_data = NULL; + int ret = 0; if(rows == NULL) { - return 0; + return ret; } /* we want the first row. if no headers are provided, use the first @@ -603,10 +604,12 @@ static int table_display(const alpm_list_t *header, if(totalwidth > cols) { pm_printf(ALPM_LOG_WARNING, _("insufficient columns available for table display\n")); - return -1; + ret = -1; + goto cleanup; } if(!totalwidth || !widths || !has_data) { - return -1; + ret = -1; + goto cleanup; } if(header) { @@ -618,9 +621,10 @@ static int table_display(const alpm_list_t *header, table_print_line(i->data, padding, totalcols, widths, has_data); } +cleanup: free(widths); free(has_data); - return 0; + return ret; } void list_display(const char *title, const alpm_list_t *list, -- cgit v1.2.3