summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorAndrew Gregory <andrew.gregory.8@gmail.com>2012-11-24 13:15:04 -0500
committerAllan McRae <allan@archlinux.org>2012-12-14 12:35:34 +1000
commit964640fbfcde48b7937a6c18964c78a3b11db3de (patch)
tree45673e7952283f229afda38c3f753b1052a4082e /lib
parentc8417f3386155028015f7f9fc43f4c64a60acf4c (diff)
downloadpacman-964640fbfcde48b7937a6c18964c78a3b11db3de.tar.xz
Plug various minor memory leaks
Signed-off-by: Andrew Gregory <andrew.gregory.8@gmail.com> Signed-off-by: Allan McRae <allan@archlinux.org>
Diffstat (limited to 'lib')
-rw-r--r--lib/libalpm/be_local.c1
-rw-r--r--lib/libalpm/dload.c1
-rw-r--r--lib/libalpm/sync.c2
3 files changed, 3 insertions, 1 deletions
diff --git a/lib/libalpm/be_local.c b/lib/libalpm/be_local.c
index bbc0a8ac..f0e4a80f 100644
--- a/lib/libalpm/be_local.c
+++ b/lib/libalpm/be_local.c
@@ -943,6 +943,7 @@ int _alpm_local_db_remove(alpm_db_t *db, alpm_pkg_t *info)
dirp = opendir(pkgpath);
if(!dirp) {
+ free(pkgpath);
return -1;
}
/* go through the local DB entry, removing the files within, which we know
diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c
index 6aaff1d2..3e1659e7 100644
--- a/lib/libalpm/dload.c
+++ b/lib/libalpm/dload.c
@@ -358,6 +358,7 @@ static FILE *create_tempfile(struct dload_payload *payload, const char *localpat
CLOSE(fd);
_alpm_log(payload->handle, ALPM_LOG_ERROR,
_("failed to create temporary file for download\n"));
+ free(randpath);
return NULL;
}
/* fp now points to our alpmtmp.XXXXXX */
diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c
index 841e5d6f..a4e58605 100644
--- a/lib/libalpm/sync.c
+++ b/lib/libalpm/sync.c
@@ -698,7 +698,7 @@ static int apply_deltas(alpm_handle_t *handle)
snprintf(from, len, "%s/%s", cachedir, d->from);
}
len = strlen(cachedir) + strlen(d->to) + 2;
- MALLOC(to, len, RET_ERR(handle, ALPM_ERR_MEMORY, 1));
+ MALLOC(to, len, free(from); RET_ERR(handle, ALPM_ERR_MEMORY, 1));
snprintf(to, len, "%s/%s", cachedir, d->to);
/* build the patch command */