summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Gregory <andrew.gregory.8@gmail.com>2015-04-12 06:01:21 +0200
committerAllan McRae <allan@archlinux.org>2015-05-12 06:00:54 +0200
commite4af5e3c9787a37103e71c7814564435ec241d4c (patch)
treee6c34553d2a86505f1f98719f781ecd008b1c11e
parentae7067440c20c49b3d11c63844d583381282c6b2 (diff)
downloadpacman-e4af5e3c9787a37103e71c7814564435ec241d4c.tar.gz
pacman-e4af5e3c9787a37103e71c7814564435ec241d4c.tar.xz
alpm_logaction: check logfile before opening
valgrind does not like calling open(NULL, ...). This also makes the return value 0 if logfile has not been set. Signed-off-by: Andrew Gregory <andrew.gregory.8@gmail.com> Signed-off-by: Allan McRae <allan@archlinux.org>
-rw-r--r--lib/libalpm/log.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/libalpm/log.c b/lib/libalpm/log.c
index fceb96f4..c049bf90 100644
--- a/lib/libalpm/log.c
+++ b/lib/libalpm/log.c
@@ -53,7 +53,7 @@ int SYMEXPORT alpm_logaction(alpm_handle_t *handle, const char *prefix,
}
/* check if the logstream is open already, opening it if needed */
- if(handle->logstream == NULL) {
+ if(handle->logstream == NULL && handle->logfile != NULL) {
int fd;
do {
fd = open(handle->logfile, O_WRONLY | O_APPEND | O_CREAT | O_CLOEXEC,