ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "fastboot: sparse_file_len() returns int64_t."

Browse source 
am: 9249f4bc41

Change-Id: Iebfcb88abdb89f708bd34e0c6417ad4dc721c106
This commit is contained in:
Tao Bao 2018-04-25 06:40:00 -07:00 • committed by android-build-merger
commit a1b308e288
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
fastboot/fastboot.cpp
View file

@ -693,10 +693,14 @@ static void queue_info_dump() {
fb_queue_notice("--------------------------------------------");
}
static struct sparse_file** load_sparse_files(int fd, int max_size) {
static struct sparse_file** load_sparse_files(int fd, int64_t max_size) {
struct sparse_file* s = sparse_file_import_auto(fd, false, true);
if (!s) die("cannot sparse read file");
if (max_size <= 0 || max_size > std::numeric_limits<uint32_t>::max()) {
die("invalid max size %" PRId64, max_size);
}
int files = sparse_file_resparse(s, max_size, nullptr, 0);
if (files < 0) die("Failed to resparse");

6
fastboot/protocol.cpp
View file

@ -344,12 +344,12 @@ static int fb_download_data_sparse_flush(Transport* transport) {
}
int fb_download_data_sparse(Transport* transport, struct sparse_file* s) {
int size = sparse_file_len(s, true, false);
if (size <= 0) {
int64_t size = sparse_file_len(s, true, false);
if (size <= 0 || size > std::numeric_limits<uint32_t>::max()) {
return -1;
}
std::string cmd(android::base::StringPrintf("download:%08x", size));
std::string cmd(android::base::StringPrintf("download:%08" PRIx64, size));
int r = _command_start(transport, cmd, size, 0);
if (r < 0) {
return -1;