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

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

Merge "fastboot driver: Fix fd ownership." am: 15acff02 am: 0f517e8d am:... 

Merge "fastboot driver: Fix fd ownership." am: 15acff02 am: 0f517e8d am: 7447300d am: 9674fbe8

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1649705

Change-Id: I7b5afbaf6e61cf17f0269b97abe59029747e6506
parents 1a071cb9 9674fbe8

fastboot/fastboot.cpp

+2 −2
Original line number Diff line number Diff line
@@ -911,8 +911,9 @@ static bool load_buf_fd(unique_fd fd, struct fastboot_buffer* buf) { 


    lseek(fd, 0, SEEK_SET);

    int64_t limit = get_sparse_limit(sz);

    buf->fd = std::move(fd);

    if (limit) {

        sparse_file** s = load_sparse_files(fd, limit);

        sparse_file** s = load_sparse_files(buf->fd.get(), limit);

        if (s == nullptr) {

            return false;

        }
@@ -921,7 +922,6 @@ static bool load_buf_fd(unique_fd fd, struct fastboot_buffer* buf) { 
    } else {

        buf->type = FB_BUFFER_FD;

        buf->data = nullptr;

        buf->fd = std::move(fd);

        buf->sz = sz;

    }