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

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

Merge "fastboot driver: Avoid use after std::move()" am: a9c8111c am: 4dc19437 am: 9425c347 

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

Change-Id: I07e7d3721611abad70922393f47a4b63c40afb6d
parents b2f32942 9425c347

fastboot/fastboot.cpp

+2 −2
Original line number Diff line number Diff line
@@ -995,7 +995,7 @@ static void rewrite_vbmeta_buffer(struct fastboot_buffer* buf, bool vbmeta_in_bo 
        die("Failed writing to modified vbmeta");

    }

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

    lseek(fd, 0, SEEK_SET);

    lseek(buf->fd, 0, SEEK_SET);

}



static bool has_vbmeta_partition() {
@@ -1063,7 +1063,7 @@ static void copy_boot_avb_footer(const std::string& partition, struct fastboot_b 
    }

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

    buf->sz = partition_size;

    lseek(fd, 0, SEEK_SET);

    lseek(buf->fd, 0, SEEK_SET);

}



static void flash_buf(const std::string& partition, struct fastboot_buffer *buf)