commit | 7f5f1b12ff8940c3d5bd842b40ce983641e33ab3 | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Mon Nov 12 23:46:41 2018 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Nov 12 23:46:41 2018 +0000 |
tree | 64c7370283066e5d809b20c61b05766337b5fe39 | |
parent | 148bf215313237fc98204ffda3e002b2ef91abed [diff] | |
parent | e3c32e0d2f120deca4809a282bea914e5d5b0a15 [diff] |
Merge "Avoid double close in delete_dir_contents."
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;