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 <shiningxc@gmail.com> Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
parent
8bee526d28
commit
8d9ee923ec
|
@ -315,7 +315,7 @@ int _alpm_remove_commit(pmtrans_t *trans, pmdb_t *db)
|
||||||
(pkg_count - alpm_list_count(targ) + 1));
|
(pkg_count - alpm_list_count(targ) + 1));
|
||||||
position++;
|
position++;
|
||||||
}
|
}
|
||||||
free(newfiles);
|
alpm_list_free(newfiles);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* set progress to 100% after we finish unlinking files */
|
/* set progress to 100% after we finish unlinking files */
|
||||||
|
|
|
@ -496,12 +496,13 @@ int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync
|
||||||
if(deps) {
|
if(deps) {
|
||||||
int errorout = 0;
|
int errorout = 0;
|
||||||
alpm_list_t *asked = NULL;
|
alpm_list_t *asked = NULL;
|
||||||
|
pmconflict_t *conflict = NULL;
|
||||||
|
|
||||||
for(i = deps; i && !errorout; i = i->next) {
|
for(i = deps; i && !errorout; i = i->next) {
|
||||||
pmconflict_t *conflict = i->data;
|
|
||||||
pmsyncpkg_t *sync;
|
pmsyncpkg_t *sync;
|
||||||
pmpkg_t *found = NULL;
|
pmpkg_t *found = NULL;
|
||||||
|
|
||||||
|
conflict = i->data;
|
||||||
_alpm_log(PM_LOG_DEBUG, "package '%s' conflicts with '%s'\n",
|
_alpm_log(PM_LOG_DEBUG, "package '%s' conflicts with '%s'\n",
|
||||||
conflict->package1, conflict->package2);
|
conflict->package1, conflict->package2);
|
||||||
/* check if the conflicting package is about to be removed/replaced.
|
/* 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 */
|
/* abort */
|
||||||
_alpm_log(PM_LOG_ERROR, _("unresolvable package conflicts detected\n"));
|
_alpm_log(PM_LOG_ERROR, _("unresolvable package conflicts detected\n"));
|
||||||
errorout = 1;
|
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 {
|
} else {
|
||||||
_alpm_log(PM_LOG_ERROR, _("unresolvable package conflicts detected\n"));
|
_alpm_log(PM_LOG_ERROR, _("unresolvable package conflicts detected\n"));
|
||||||
errorout = 1;
|
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) {
|
if(errorout) {
|
||||||
|
/* The last conflict was unresolvable, so we duplicate it and add it to *data */
|
||||||
pm_errno = PM_ERR_CONFLICTING_DEPS;
|
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;
|
ret = -1;
|
||||||
goto cleanup;
|
goto cleanup;
|
||||||
}
|
}
|
||||||
FREELIST(deps);
|
|
||||||
FREELIST(asked);
|
FREELIST(asked);
|
||||||
|
FREELIST(deps);
|
||||||
}
|
}
|
||||||
EVENT(trans, PM_TRANS_EVT_INTERCONFLICTS_DONE, NULL, NULL);
|
EVENT(trans, PM_TRANS_EVT_INTERCONFLICTS_DONE, NULL, NULL);
|
||||||
}
|
}
|
||||||
|
|
|
@ -175,6 +175,7 @@ int pacman_add(alpm_list_t *targets)
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
add_cleanup();
|
add_cleanup();
|
||||||
|
alpm_list_free_inner(data, free);
|
||||||
alpm_list_free(data);
|
alpm_list_free(data);
|
||||||
return(1);
|
return(1);
|
||||||
}
|
}
|
||||||
|
|
|
@ -133,6 +133,7 @@ int pacman_remove(alpm_list_t *targets)
|
||||||
depstring);
|
depstring);
|
||||||
free(depstring);
|
free(depstring);
|
||||||
}
|
}
|
||||||
|
alpm_list_free_inner(data, free);
|
||||||
alpm_list_free(data);
|
alpm_list_free(data);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
|
|
|
@ -621,7 +621,7 @@ int sync_trans(alpm_list_t *targets, int sync_only)
|
||||||
case PM_ERR_CONFLICTING_DEPS:
|
case PM_ERR_CONFLICTING_DEPS:
|
||||||
for(i = data; i; i = alpm_list_next(i)) {
|
for(i = data; i; i = alpm_list_next(i)) {
|
||||||
pmconflict_t *conflict = alpm_list_getdata(i);
|
pmconflict_t *conflict = alpm_list_getdata(i);
|
||||||
printf(_(":: %s: conflicts with %s"),
|
printf(_(":: %s: conflicts with %s\n"),
|
||||||
alpm_conflict_get_package1(conflict), alpm_conflict_get_package2(conflict));
|
alpm_conflict_get_package1(conflict), alpm_conflict_get_package2(conflict));
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
@ -706,6 +706,7 @@ int sync_trans(alpm_list_t *targets, int sync_only)
|
||||||
/* Step 4: release transaction resources */
|
/* Step 4: release transaction resources */
|
||||||
cleanup:
|
cleanup:
|
||||||
if(data) {
|
if(data) {
|
||||||
|
alpm_list_free_inner(data, free);
|
||||||
alpm_list_free(data);
|
alpm_list_free(data);
|
||||||
}
|
}
|
||||||
if(alpm_trans_release() == -1) {
|
if(alpm_trans_release() == -1) {
|
||||||
|
|
Loading…
Reference in New Issue