From 60d958c78bf5c6fca761492b4849dd36f098eb41 Mon Sep 17 00:00:00 2001 From: Allan McRae Date: Wed, 24 Dec 2014 11:55:49 +1000 Subject: Initialize memory to prevent issues when freeing on error Signed-off-by: Allan McRae --- lib/libalpm/conflict.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/libalpm/conflict.c') diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c index 40cbb953..c886f785 100644 --- a/lib/libalpm/conflict.c +++ b/lib/libalpm/conflict.c @@ -48,7 +48,7 @@ static alpm_conflict_t *conflict_new(alpm_pkg_t *pkg1, alpm_pkg_t *pkg2, { alpm_conflict_t *conflict; - MALLOC(conflict, sizeof(alpm_conflict_t), return NULL); + CALLOC(conflict, 1, sizeof(alpm_conflict_t), return NULL); conflict->package1_hash = pkg1->name_hash; conflict->package2_hash = pkg2->name_hash; @@ -273,7 +273,7 @@ static alpm_list_t *add_fileconflict(alpm_handle_t *handle, alpm_pkg_t *pkg1, alpm_pkg_t *pkg2) { alpm_fileconflict_t *conflict; - MALLOC(conflict, sizeof(alpm_fileconflict_t), goto error); + CALLOC(conflict, 1, sizeof(alpm_fileconflict_t), goto error); STRDUP(conflict->target, pkg1->name, goto error); STRDUP(conflict->file, filestr, goto error); -- cgit v1.2.3-24-g4f1b