summaryrefslogtreecommitdiffstats
path: root/lib/libalpm
diff options
context:
space:
mode:
authorXavier Chantry <shiningxc@gmail.com>2009-07-20 14:52:16 +0200
committerDan McGee <dan@archlinux.org>2009-07-20 23:37:45 +0200
commit60b6cde637338657e72312aef1ff1d04314df745 (patch)
tree2570113597f7070eee3aa9365a9a8acd00c5db20 /lib/libalpm
parent5d15bb68f7b6b3e25be286ddf7a615553a173b8f (diff)
downloadpacman-60b6cde637338657e72312aef1ff1d04314df745.tar.gz
pacman-60b6cde637338657e72312aef1ff1d04314df745.tar.xz
Fix 2 minor memleaks
Signed-off-by: Xavier Chantry <shiningxc@gmail.com> Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'lib/libalpm')
-rw-r--r--lib/libalpm/conflict.c2
-rw-r--r--lib/libalpm/handle.c1
-rw-r--r--lib/libalpm/sync.c1
3 files changed, 3 insertions, 1 deletions
diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c
index a6d50d4f..07ef73cf 100644
--- a/lib/libalpm/conflict.c
+++ b/lib/libalpm/conflict.c
@@ -534,7 +534,7 @@ alpm_list_t *_alpm_db_find_fileconflicts(pmdb_t *db, pmtrans_t *trans,
if(!resolved_conflict && dbpkg) {
char *rpath = calloc(PATH_MAX+1, sizeof(char));
if(!realpath(path, rpath)) {
- free(rpath);
+ FREE(rpath);
continue;
}
char *filestr = rpath + strlen(handle->root);
diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c
index 4d341a8b..34115b38 100644
--- a/lib/libalpm/handle.c
+++ b/lib/libalpm/handle.c
@@ -287,6 +287,7 @@ int SYMEXPORT alpm_option_set_root(const char *root)
realroot = calloc(PATH_MAX+1, sizeof(char));
if(!realpath(root, realroot)) {
+ FREE(realroot);
pm_errno = PM_ERR_NOT_A_DIR;
return(-1);
}
diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c
index 85186bbf..ffcddf98 100644
--- a/lib/libalpm/sync.c
+++ b/lib/libalpm/sync.c
@@ -352,6 +352,7 @@ int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync
/* Else, [resolved] now additionally contains [pkg] and all of its
dependencies not already on the list */
}
+ alpm_list_free(preferred);
/* If there were unresolvable top-level packages, prompt the user to
see if they'd like to ignore them rather than failing the sync */