summaryrefslogtreecommitdiff
path: root/common/path_utils
diff options
context:
space:
mode:
authorStephen Gallagher <sgallagh@redhat.com>2010-06-09 09:59:52 -0400
committerStephen Gallagher <sgallagh@redhat.com>2010-06-10 10:17:38 -0400
commita40b812b63e9f32c946761cb9cb7315ee57376ed (patch)
tree2d501418f8b0ccdb323b9a115e1c0c2fd337c966 /common/path_utils
parent6d8973d78dcf83c943f3cbc0cdb509987994a01b (diff)
downloadsssd-a40b812b63e9f32c946761cb9cb7315ee57376ed.tar.gz
sssd-a40b812b63e9f32c946761cb9cb7315ee57376ed.tar.bz2
sssd-a40b812b63e9f32c946761cb9cb7315ee57376ed.zip
Don't leak directory access resources on errors in directory_list()
https://fedorahosted.org/sssd/ticket/514
Diffstat (limited to 'common/path_utils')
-rw-r--r--common/path_utils/path_utils.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/common/path_utils/path_utils.c b/common/path_utils/path_utils.c
index 493e0a4d..97c845c7 100644
--- a/common/path_utils/path_utils.c
+++ b/common/path_utils/path_utils.c
@@ -538,6 +538,10 @@ int directory_list(const char *path, bool recursive,
error = path_concat(entry_path, sizeof(entry_path),
path, entry->d_name);
if (error != SUCCESS) {
+ closedir(dir);
+ /* Don't bother checking the return here.
+ * The path_concat error is more important
+ */
return error;
}
@@ -551,6 +555,10 @@ int directory_list(const char *path, bool recursive,
error = directory_list(entry_path, recursive,
callback, user_data);
if (error != SUCCESS) {
+ closedir(dir);
+ /* Don't bother checking the return here.
+ * The directory_list error is more important
+ */
return error;
}
}