commit a1e2858cb842b473b6ac98bb499a15aafaae0f36
author Hobin Woo <hobin.woo@samsung.corp-partner.google.com> Mon Nov 07 21:16:51 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Nov 07 21:16:51 2022 +0000
tree 924be72429297471fba997e9202c69c046364af6
parent a29eb594b9f38f1bc4cff3cde27ea97f90c9beb8
parent ce87de0d5a7ce15280cd544fd66bae128dc9ec9b

Fix file descriptor leak on IncFS v1 am: 4d2d129f2b am: 2346524072 am: ce87de0d5a

Original change: https://android-review.googlesource.com/c/platform/system/incremental_delivery/+/2289234

Change-Id: I1eba213f3789f2c62a3da9ba9e808b0df1168a77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

incfs/incfs.cpp

diff --git a/incfs/incfs.cpp b/incfs/incfs.cpp
index e13cd81..29574c1 100644
--- a/incfs/incfs.cpp
+++ b/incfs/incfs.cpp
@@ -1611,7 +1611,8 @@
         }
         return isFullyLoadedV2(root, id);
     }
-    return isFullyLoadedSlow(openForSpecialOps(control->cmd, makeCommandPath(root, path).c_str()));
+    auto fd = ab::unique_fd(openForSpecialOps(control->cmd, makeCommandPath(root, path).c_str()));
+    return isFullyLoadedSlow(fd.get());
 }
 IncFsErrorCode IncFs_IsFullyLoadedById(const IncFsControl* control, IncFsFileId fileId) {
     if (!control) {
@@ -1624,9 +1625,10 @@
     if (features() & Features::v2) {
         return isFullyLoadedV2(root, fileId);
     }
-    return isFullyLoadedSlow(
+    auto fd = ab::unique_fd(
             openForSpecialOps(control->cmd,
                               makeCommandPath(root, indexPath(root, fileId)).c_str()));
+    return isFullyLoadedSlow(fd.get());
 }
 
 static IncFsErrorCode isEverythingLoadedV2(const IncFsControl* control) {