[#3708] fixed closedir

Razvan Becheriu · Razvan Becheriu · commit 66411246d672 · 2025-01-22T16:02:23.000Z
diff --git a/src/lib/util/filesystem.cc b/src/lib/util/filesystem.cc
@@ -195,6 +195,8 @@ TemporaryDirectory::~TemporaryDirectory() {
         return;
     }
 
+    std::unique_ptr<DIR, void(*)(DIR*)> defer(dir, [](DIR* d) { closedir(d); });
+
     struct dirent *i;
     string filepath;
     while ((i = readdir(dir))) {
@@ -205,7 +207,7 @@ TemporaryDirectory::~TemporaryDirectory() {
         filepath = dir_name_ + '/' + i->d_name;
         remove(filepath.c_str());
     }
-    closedir(dir);
+
     rmdir(dir_name_.c_str());
 }
 

Original file line number	Diff line number	Diff line change
`@@ -195,6 +195,8 @@ TemporaryDirectory::~TemporaryDirectory() {`
`195`	`195`	`return;`
`196`	`196`	`}`
`197`	`197`
	`198`	`+ std::unique_ptr<DIR, void()(DIR)> defer(dir, [](DIR* d) { closedir(d); });`
	`199`	`+`
`198`	`200`	`struct dirent *i;`
`199`	`201`	`string filepath;`
`200`	`202`	`while ((i = readdir(dir))) {`
`@@ -205,7 +207,7 @@ TemporaryDirectory::~TemporaryDirectory() {`
`205`	`207`	`filepath = dir_name_ + '/' + i->d_name;`
`206`	`208`	`remove(filepath.c_str());`
`207`	`209`	`}`
`208`		`- closedir(dir);`
	`210`	`+`
`209`	`211`	`rmdir(dir_name_.c_str());`
`210`	`212`	`}`
`211`	`213`