From 4c2cf0bc498c59343257fbae6dd93ec1a9fb88bc Mon Sep 17 00:00:00 2001
From: Stephen Gallagher <sgallagh@redhat.com>
Date: Thu, 17 Jun 2010 15:55:42 -0400
Subject: Fix potential resource leak in remove_tree_with_ctx()

https://fedorahosted.org/sssd/ticket/515
---
 src/tools/files.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/tools/files.c b/src/tools/files.c
index 3d45679d4..694753549 100644
--- a/src/tools/files.c
+++ b/src/tools/files.c
@@ -110,7 +110,7 @@ static int remove_tree_with_ctx(TALLOC_CTX *mem_ctx,
     struct dirent direntp;
     struct stat statres;
     DIR *rootdir = NULL;
-    int ret;
+    int ret, err;
 
     rootdir = opendir(root);
     if (rootdir == NULL) {
@@ -174,6 +174,7 @@ static int remove_tree_with_ctx(TALLOC_CTX *mem_ctx,
     }
 
     ret = closedir(rootdir);
+    rootdir = NULL;
     if (ret != 0) {
         ret = errno;
         goto fail;
@@ -185,7 +186,15 @@ static int remove_tree_with_ctx(TALLOC_CTX *mem_ctx,
         goto fail;
     }
 
+    ret = EOK;
+
 fail:
+    if (rootdir) {  /* clean up on abnormal exit but retain return code */
+        err = closedir(rootdir);
+        if (err) {
+            DEBUG(1, ("closedir failed, bad dirp?\n"));
+        }
+    }
     return ret;
 }
 
-- 
cgit