From 8d9ee923ec3860e3f1133a66a0dc94ce85644bb4 Mon Sep 17 00:00:00 2001 From: Chantry Xavier Date: Wed, 21 Nov 2007 19:51:46 +0100 Subject: Fix several memleaks, mostly related to errors handling. * The frontend calls alpm_trans_prepare(&data), and in case of errors, receive the missing dependencies / conflicts / etc in the data pointer. It apparently needs to free this structure totally with : alpm_list_free_inner(data, free) alpm_list_free(data) So I added alpm_list_free_inner(data, free) in pacman/{sync.c,remove.c,add,c} * in _alpm_sync_prepare, the deps and asked lists were not freed in case of errors (unresolvable conflicts). Besides the code for handling this case was duplicated. * in _alpm_remove_commit, free was used instead of alpm_list_free for newfiles. * newline fix in pacman/sync.c Signed-off-by: Chantry Xavier Signed-off-by: Dan McGee --- lib/libalpm/sync.c | 42 ++++++++++++++++++------------------------ 1 file changed, 18 insertions(+), 24 deletions(-) (limited to 'lib/libalpm/sync.c') diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index f03a78be..b49bbfb6 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -496,12 +496,13 @@ int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync if(deps) { int errorout = 0; alpm_list_t *asked = NULL; + pmconflict_t *conflict = NULL; for(i = deps; i && !errorout; i = i->next) { - pmconflict_t *conflict = i->data; pmsyncpkg_t *sync; pmpkg_t *found = NULL; + conflict = i->data; _alpm_log(PM_LOG_DEBUG, "package '%s' conflicts with '%s'\n", conflict->package1, conflict->package2); /* check if the conflicting package is about to be removed/replaced. @@ -614,42 +615,35 @@ int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync /* abort */ _alpm_log(PM_LOG_ERROR, _("unresolvable package conflicts detected\n")); errorout = 1; - if(data) { - if((conflict = malloc(sizeof(pmconflict_t))) == NULL) { - _alpm_log(PM_LOG_ERROR, _("malloc failure: could not allocate %zd bytes\n"), sizeof(pmconflict_t)); - FREELIST(*data); - pm_errno = PM_ERR_MEMORY; - ret = -1; - goto cleanup; - } - *conflict = *(pmconflict_t *)i->data; - *data = alpm_list_add(*data, conflict); - } } } } else { _alpm_log(PM_LOG_ERROR, _("unresolvable package conflicts detected\n")); errorout = 1; - if(data) { - if((conflict = malloc(sizeof(pmconflict_t))) == NULL) { - _alpm_log(PM_LOG_ERROR, _("malloc failure: could not allocate %zd bytes\n"), sizeof(pmconflict_t)); - FREELIST(*data); - pm_errno = PM_ERR_MEMORY; - ret = -1; - goto cleanup; - } - *conflict = *(pmconflict_t *)i->data; - *data = alpm_list_add(*data, conflict); - } } } if(errorout) { + /* The last conflict was unresolvable, so we duplicate it and add it to *data */ pm_errno = PM_ERR_CONFLICTING_DEPS; + if(data) { + pmconflict_t *lastconflict = conflict; + if((conflict = malloc(sizeof(pmconflict_t))) == NULL) { + _alpm_log(PM_LOG_ERROR, _("malloc failure: could not allocate %zd bytes\n"), + sizeof(pmconflict_t)); + FREELIST(*data); + pm_errno = PM_ERR_MEMORY; + } else { + *conflict = *lastconflict; + *data = alpm_list_add(*data, conflict); + } + } + FREELIST(asked); + FREELIST(deps); ret = -1; goto cleanup; } - FREELIST(deps); FREELIST(asked); + FREELIST(deps); } EVENT(trans, PM_TRANS_EVT_INTERCONFLICTS_DONE, NULL, NULL); } -- cgit v1.2.3-24-g4f1b