bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

libalpm/sync.c : memleak fixes.

Browse source 
Signed-off-by: Chantry Xavier <shiningxc@gmail.com>
This commit is contained in:
Chantry Xavier 2008-02-27 17:45:01 +01:00 • committed by Dan McGee
parent 670fadf041
commit 8fdf08ef78
1 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
lib/libalpm/sync.c
View file

@ -796,6 +796,7 @@ int _alpm_sync_commit(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t **data)
int replaces = 0; int replaces = 0;
int errors = 0; int errors = 0;
const char *cachedir = NULL; const char *cachedir = NULL;
int ret = -1;
ALPM_LOG_FUNC; ALPM_LOG_FUNC;
@ -854,9 +855,9 @@ int _alpm_sync_commit(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t **data)
if(_alpm_download_files(files, current->servers, cachedir)) { if(_alpm_download_files(files, current->servers, cachedir)) {
_alpm_log(PM_LOG_WARNING, _("failed to retrieve some files from %s\n"), _alpm_log(PM_LOG_WARNING, _("failed to retrieve some files from %s\n"),
current->treename); current->treename);
RET_ERR(PM_ERR_RETRIEVE, -1); pm_errno = PM_ERR_RETRIEVE;
goto error;
} }
FREELIST(files);
} }
} }
if(trans->flags & PM_TRANS_FLAG_PRINTURIS) { if(trans->flags & PM_TRANS_FLAG_PRINTURIS) {
@ -893,8 +894,6 @@ int _alpm_sync_commit(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t **data)
ret = apply_deltas(trans); ret = apply_deltas(trans);
EVENT(trans, PM_TRANS_EVT_DELTA_PATCHES_DONE, NULL, NULL); EVENT(trans, PM_TRANS_EVT_DELTA_PATCHES_DONE, NULL, NULL);
alpm_list_free(deltas);
deltas = NULL;
} }
if(ret) { if(ret) {
pm_errno = PM_ERR_DLT_PATCHFAILED; pm_errno = PM_ERR_DLT_PATCHFAILED;
@ -1009,15 +1008,15 @@ int _alpm_sync_commit(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t **data)
_alpm_log(PM_LOG_ERROR, _("could not commit transaction\n")); _alpm_log(PM_LOG_ERROR, _("could not commit transaction\n"));
goto error; goto error;
} }
_alpm_trans_free(tr); ret = 0;
tr = NULL;
return(0);
error: error:
FREELIST(files);
alpm_list_free(deltas);
deltas = NULL;
_alpm_trans_free(tr); _alpm_trans_free(tr);
tr = NULL; tr = NULL;
return(-1); return(ret);
} }
pmsyncpkg_t *_alpm_sync_find(alpm_list_t *syncpkgs, const char* pkgname) pmsyncpkg_t *_alpm_sync_find(alpm_list_t *syncpkgs, const char* pkgname)