commit e3c32e0d2f120deca4809a282bea914e5d5b0a15
author Josh Gao <jmgao@google.com> Mon Nov 05 13:47:28 2018 -0800
committer Josh Gao <jmgao@google.com> Mon Nov 05 13:59:46 2018 -0800
tree 64c7370283066e5d809b20c61b05766337b5fe39
parent 298fa3264f197fb0c871499c3ec16a0b0ff39580

Avoid double close in delete_dir_contents.

fdopendir takes ownership of the file descriptor, leading to it being
closed by both unique_fd's destructor and closedir.

Test: treehugger
Change-Id: Ibd193e988c77c5323720531445f334c0795c68b9

Utils.cpp

diff --git a/Utils.cpp b/Utils.cpp
index 8af616d..f7afde5 100644
--- a/Utils.cpp
+++ b/Utils.cpp
@@ -818,7 +818,8 @@
                 result = -errno;
                 continue;
             }
-            std::unique_ptr<DIR, decltype(&closedir)> subdirp(fdopendir(subfd), closedir);
+            std::unique_ptr<DIR, decltype(&closedir)> subdirp(
+                android::base::Fdopendir(std::move(subfd)), closedir);
             if (!subdirp) {
                 PLOG(ERROR) << "Couldn't fdopendir " << name;
                 result = -errno;