Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0d76ed04 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: I80b637f0f081864ad0627d0e0bae184c8f9993e5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b75c0c1a df17b83c

cmds/dumpstate/dumpstate.cpp

+3 −3
Original line number Diff line number Diff line
@@ -4143,14 +4143,14 @@ int Dumpstate::DumpFile(const std::string& title, const std::string& path) { 
}



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;