commit 9e46d1c9963afa0613e854fa8b06d98235ea960b
author Mathieu Chartier <mathieuc@google.com> Fri Nov 02 19:30:18 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Nov 02 19:30:18 2018 +0000
tree 65a0d85679fa2a96a348c41fcd62d6df9923f501
parent ad25300196e0478b07607f20d2fe79f9f218a470
parent 89883e3f4c2411c2128e0c07bec3a5a12daf4d4b

Merge "Fix fdsan error"

cmds/installd/utils.cpp

diff --git a/cmds/installd/utils.cpp b/cmds/installd/utils.cpp
index 6b9cf0d..74ad184 100644
--- a/cmds/installd/utils.cpp
+++ b/cmds/installd/utils.cpp
@@ -43,6 +43,7 @@
 #define DEBUG_XATTRS 0
 
 using android::base::EndsWith;
+using android::base::Fdopendir;
 using android::base::StringPrintf;
 using android::base::unique_fd;
 
@@ -1036,7 +1037,7 @@
                 continue;
             }
 
-            DIR* subdir = fdopendir(subdir_fd);
+            DIR* subdir = Fdopendir(std::move(subdir_fd));
             if (subdir == nullptr) {
                 PLOG(WARNING) << "Could not open dir path " << local_path;
                 result = false;