summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2008-03-23 15:28:48 -0500
committerDan McGee <dan@archlinux.org>2008-03-23 16:55:52 -0500
commit1086950c82ab649ffc36a00cd8d343da376252fe (patch)
treeea3298b195122e928e10a1ea2f527e6577c3fe80
parent7995a25d0ed75968df72fcf65d231508417ec060 (diff)
downloadpacman-1086950c82ab649ffc36a00cd8d343da376252fe.tar.xz
memleak fix: ensure backup fname isn't lost if unused
The _alpm_backup_split function always alloced memory for the fname, and we let it disappear in a specific case (upgrade026.py). Fix the issue. Signed-off-by: Dan McGee <dan@archlinux.org>
-rw-r--r--lib/libalpm/add.c1
-rw-r--r--lib/libalpm/backup.c3
2 files changed, 4 insertions, 0 deletions
diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c
index eddf637e..8b06bef5 100644
--- a/lib/libalpm/add.c
+++ b/lib/libalpm/add.c
@@ -243,6 +243,7 @@ static int upgrade_remove(pmpkg_t *oldpkg, pmpkg_t *newpkg, pmtrans_t *trans, pm
char *backup = _alpm_backup_file(b->data);
/* safety check (fix the upgrade026 pactest) */
if(!alpm_list_find_str(filelist, backup)) {
+ FREE(backup);
continue;
}
_alpm_log(PM_LOG_DEBUG, "adding %s to the NoUpgrade array temporarily\n",
diff --git a/lib/libalpm/backup.c b/lib/libalpm/backup.c
index bedbe8c1..f89df55e 100644
--- a/lib/libalpm/backup.c
+++ b/lib/libalpm/backup.c
@@ -42,6 +42,9 @@ int _alpm_backup_split(const char *string, char **file, char **hash)
if(ptr == NULL) {
if(file) {
*file = str;
+ } else {
+ /* don't need our dup as the fname wasn't requested, so free it */
+ FREE(str);
}
return(0);
}