tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "fastboot driver: Fix fd ownership."

Browse source
This commit is contained in:
Treehugger Robot 2021-03-23 05:33:20 +00:00 committed by Gerrit Code Review
commit 15acff029f
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
fastboot/fastboot.cpp
View file

@ -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;
}