From 1003dcd7681511c5b703e6723e207cdd50d82885 Mon Sep 17 00:00:00 2001
From: Jakub Hrozek <jhrozek@redhat.com>
Date: Thu, 3 Jun 2010 18:50:42 +0200
Subject: Fix potential resource leak in copy_tree_ctx()

Ticket #515
---
 src/tools/files.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/tools/files.c b/src/tools/files.c
index 27ebf72db..3d45679d4 100644
--- a/src/tools/files.c
+++ b/src/tools/files.c
@@ -603,8 +603,8 @@ static int copy_tree_ctx(struct copy_ctx *cctx,
                          uid_t uid,
                          gid_t gid)
 {
-    DIR *src_dir;
-    int ret;
+    DIR *src_dir = NULL;
+    int ret, err;
     struct dirent *result;
     struct dirent direntp;
     char *src_name, *dst_name;
@@ -651,12 +651,20 @@ static int copy_tree_ctx(struct copy_ctx *cctx,
     }
 
     ret = closedir(src_dir);
+    src_dir = NULL;
     if (ret != 0) {
         ret = errno;
         goto fail;
     }
 
+    ret = EOK;
 fail:
+    if (src_dir) {  /* clean up on abnormal exit but retain return code */
+        err = closedir(src_dir);
+        if (err) {
+            DEBUG(1, ("closedir failed, bad dirp?\n"));
+        }
+    }
     talloc_free(tmp_ctx);
     return ret;
 }
-- 
cgit