[pacman-dev] [PATCH] _alpm_run_chroot: only close working directory if it was opened

Allan McRae allan at archlinux.org
Wed Dec 24 02:58:31 UTC 2014


Signed-off-by: Allan McRae <allan at archlinux.org>
---
 lib/libalpm/util.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c
index 43d0d7b..22408d7 100644
--- a/lib/libalpm/util.c
+++ b/lib/libalpm/util.c
@@ -542,7 +542,9 @@ int _alpm_run_chroot(alpm_handle_t *handle, const char *cmd, char *const argv[])
 		while(dup2(pipefd[1], 2) == -1 && errno == EINTR);
 		close(pipefd[0]);
 		close(pipefd[1]);
-		close(cwdfd);
+		if(cwdfd >= 0) {
+			close(cwdfd);
+		}
 
 		/* use fprintf instead of _alpm_log to send output through the parent */
 		if(chroot(handle->root) != 0) {
-- 
2.2.1


More information about the pacman-dev mailing list