1
0
mirror of https://github.com/moparisthebest/pacman synced 2024-11-11 03:54:59 -05:00

libalpm/sync.c : two memleak fixes in _alpm_sync_prepare.

Signed-off-by: Chantry Xavier <shiningxc@gmail.com>
This commit is contained in:
Nagy Gabor 2007-07-20 10:43:55 +02:00 committed by Dan McGee
parent b0c064d59b
commit 0d00f7095f

View File

@ -433,13 +433,8 @@ int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync
} }
/* re-order w.r.t. dependencies */ /* re-order w.r.t. dependencies */
alpm_list_t *sortlist = NULL; alpm_list_t *sortlist = _alpm_sortbydeps(list, PM_TRANS_TYPE_ADD);
alpm_list_t *newpkgs = NULL; alpm_list_t *newpkgs = NULL;
for(i = trans->packages; i; i = i->next) {
pmsyncpkg_t *s = i->data;
sortlist = alpm_list_add(sortlist, s->pkg);
}
sortlist = _alpm_sortbydeps(sortlist, PM_TRANS_TYPE_ADD);
for(i = sortlist; i; i = i->next) { for(i = sortlist; i; i = i->next) {
for(j = trans->packages; j; j = j->next) { for(j = trans->packages; j; j = j->next) {
pmsyncpkg_t *s = j->data; pmsyncpkg_t *s = j->data;
@ -459,13 +454,13 @@ int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync
if(deps) { if(deps) {
if(data) { if(data) {
*data = deps; *data = deps;
deps = NULL; } else {
FREELIST(deps);
} }
pm_errno = PM_ERR_UNSATISFIED_DEPS; pm_errno = PM_ERR_UNSATISFIED_DEPS;
ret = -1; ret = -1;
goto cleanup; goto cleanup;
} }
} }
/* We don't care about conflicts if we're just printing uris */ /* We don't care about conflicts if we're just printing uris */