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

fixed various memory leaks

Browse source
This commit is contained in:
Aurelien Foret 2006-01-02 13:14:00 +00:00
parent d7f4350c29
commit 64055e0f74
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/libalpm/add.c
View file

@ -191,7 +191,6 @@ error:
int add_prepare(pmtrans_t *trans, pmdb_t *db, PMList **data) int add_prepare(pmtrans_t *trans, pmdb_t *db, PMList **data)
{ {
PMList *lp; PMList *lp;
PMList *skiplist = NULL;
ASSERT(trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1)); ASSERT(trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1));
ASSERT(db != NULL, RET_ERR(PM_ERR_DB_NULL, -1)); ASSERT(db != NULL, RET_ERR(PM_ERR_DB_NULL, -1));
@ -266,6 +265,8 @@ int add_prepare(pmtrans_t *trans, pmdb_t *db, PMList **data)
/* Check for file conflicts /* Check for file conflicts
*/ */
if(!(trans->flags & PM_TRANS_FLAG_FORCE)) { if(!(trans->flags & PM_TRANS_FLAG_FORCE)) {
PMList *skiplist = NULL;
EVENT(trans, PM_TRANS_EVT_FILECONFLICTS_START, NULL, NULL); EVENT(trans, PM_TRANS_EVT_FILECONFLICTS_START, NULL, NULL);
_alpm_log(PM_LOG_FLOW1, "looking for file conflicts"); _alpm_log(PM_LOG_FLOW1, "looking for file conflicts");
@ -280,6 +281,7 @@ int add_prepare(pmtrans_t *trans, pmdb_t *db, PMList **data)
for(lp = skiplist; lp; lp = lp->next) { for(lp = skiplist; lp; lp = lp->next) {
trans->skiplist = pm_list_add(trans->skiplist, lp->data); trans->skiplist = pm_list_add(trans->skiplist, lp->data);
} }
FREELISTPTR(skiplist);
EVENT(trans, PM_TRANS_EVT_FILECONFLICTS_DONE, NULL, NULL); EVENT(trans, PM_TRANS_EVT_FILECONFLICTS_DONE, NULL, NULL);
} }
@ -459,6 +461,7 @@ int add_commit(pmtrans_t *trans, pmdb_t *db)
errors++; errors++;
unlink(temp); unlink(temp);
FREE(temp); FREE(temp);
FREE(md5_orig);
close(fd); close(fd);
continue; continue;
} }