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

Merge "Fix fastboot to cope with hammerhead\'s implicit hex." am: 2b7b3bd100 am: 4ca547be67

Browse source 
am: 0406de14d0

* commit '0406de14d023918f4cdb3c928b6c2f3f67abf9e5':
  Fix fastboot to cope with hammerhead's implicit hex.
This commit is contained in:
Elliott Hughes 2015-11-03 17:00:37 +00:00 committed by android-build-merger
commit 4976a70b94
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
fastboot/fastboot.cpp
View file

@ -576,7 +576,7 @@ static struct sparse_file **load_sparse_files(int fd, int max_size)
static int64_t get_target_sparse_limit(usb_handle* usb) {
std::string max_download_size;
if (!fb_getvar(usb, "max-download-size", &max_download_size)) {
if (!fb_getvar(usb, "max-download-size", &max_download_size) || max_download_size.empty()) {
fprintf(stderr, "target didn't report max-download-size\n");
return 0;
}
@ -935,6 +935,10 @@ static void fb_perform_format(usb_handle* usb,
return;
}
// Some bootloaders (hammerhead, for example) use implicit hex.
// This code used to use strtol with base 16.
if (!android::base::StartsWith(partition_size, "0x")) partition_size = "0x" + partition_size;
int64_t size;
if (!android::base::ParseInt(partition_size.c_str(), &size)) {
fprintf(stderr, "Couldn't parse partition size '%s'.\n", partition_size.c_str());