From 964640fbfcde48b7937a6c18964c78a3b11db3de Mon Sep 17 00:00:00 2001 From: Andrew Gregory Date: Sat, 24 Nov 2012 13:15:04 -0500 Subject: Plug various minor memory leaks Signed-off-by: Andrew Gregory Signed-off-by: Allan McRae --- src/pacman/pacman.c | 5 +++-- src/pacman/util.c | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 1ca746d7..a25bbf84 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -812,10 +812,11 @@ int main(int argc, char *argv[]) /* we support reading targets from stdin if a cmdline parameter is '-' */ if(!isatty(fileno(stdin)) && alpm_list_find_str(pm_targets, "-")) { size_t current_size = PATH_MAX; - char *line = malloc(current_size); + char *vdata, *line = malloc(current_size); /* remove the '-' from the list */ - pm_targets = alpm_list_remove_str(pm_targets, "-", NULL); + pm_targets = alpm_list_remove_str(pm_targets, "-", &vdata); + free(vdata); i = 0; while((line[i] = (char)fgetc(stdin)) != EOF) { diff --git a/src/pacman/util.c b/src/pacman/util.c index 78cdf264..4c471dd6 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -560,6 +560,8 @@ static size_t table_calc_widths(const alpm_list_t *header, colwidths = malloc(totalcols * sizeof(size_t)); coldata = calloc(totalcols, sizeof(int)); if(!colwidths || !coldata) { + free(colwidths); + free(coldata); return 0; } /* header determines column count and initial values of longest_strs */ -- cgit v1.2.3-24-g4f1b