commit 0d76ed04c9aa37b714a4b0c2cc604107c2508bc0
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Mon Mar 11 11:14:11 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Mar 11 11:14:11 2024 +0000
tree df94385787f4603d3637cbfe9123fd02b3d47225
parent b75c0c1a774e984326eb567f701e0ce3e11b4c53
parent df17b83ccfa52c58a3821703ee6a26dce2adc369

Merge "Fix dumpstate read_file_as_long fd leak" into main am: df17b83ccf

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2988715

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

cmds/dumpstate/dumpstate.cpp

diff --git a/cmds/dumpstate/dumpstate.cpp b/cmds/dumpstate/dumpstate.cpp
index befb5d4..c501921 100644
--- a/cmds/dumpstate/dumpstate.cpp
+++ b/cmds/dumpstate/dumpstate.cpp
@@ -4143,14 +4143,14 @@
 }
 
 int read_file_as_long(const char *path, long int *output) {
-    int fd = TEMP_FAILURE_RETRY(open(path, O_RDONLY | O_NONBLOCK | O_CLOEXEC));
-    if (fd < 0) {
+    android::base::unique_fd fd(TEMP_FAILURE_RETRY(open(path, O_RDONLY | O_NONBLOCK | O_CLOEXEC)));
+    if (fd.get() < 0) {
         int err = errno;
         MYLOGE("Error opening file descriptor for %s: %s\n", path, strerror(err));
         return -1;
     }
     char buffer[50];
-    ssize_t bytes_read = TEMP_FAILURE_RETRY(read(fd, buffer, sizeof(buffer)));
+    ssize_t bytes_read = TEMP_FAILURE_RETRY(read(fd.get(), buffer, sizeof(buffer)));
     if (bytes_read == -1) {
         MYLOGE("Error reading file %s: %s\n", path, strerror(errno));
         return -2;