commit 95dccc2f5f35b917d149f46b203b08d69c83319f
author Elliott Hughes <enh@google.com> Tue Nov 03 00:07:18 2015 +0000
committer android-build-merger <android-build-merger@google.com> Tue Nov 03 00:07:18 2015 +0000
tree 8e054bfd8ed444a950ce8aa2391ae2e791711d7a
parent 07902ccdaaf666a705950f0244115364052117cf
parent 16494c484e47e51a70cb47477eed415907a79e58

Merge "Work around an angler bootloader bug."
am: 9eab787560

* commit '9eab7875602dec9910002f080df513077f56a2dd':
  Work around an angler bootloader bug.

fastboot/fastboot.cpp

diff --git a/fastboot/fastboot.cpp b/fastboot/fastboot.cpp
index 6514920..3b25a82 100644
--- a/fastboot/fastboot.cpp
+++ b/fastboot/fastboot.cpp
@@ -44,6 +44,7 @@
 #include <unistd.h>
 
 #include <base/parseint.h>
+#include <base/strings.h>
 #include <sparse/sparse.h>
 #include <ziparchive/zip_archive.h>
 
@@ -580,6 +581,9 @@
         return 0;
     }
 
+    // Some bootloaders (angler, for example) send spurious whitespace too.
+    max_download_size = android::base::Trim(max_download_size);
+
     uint64_t limit;
     if (!android::base::ParseUint(max_download_size.c_str(), &limit)) {
         fprintf(stderr, "couldn't parse max-download-size '%s'\n", max_download_size.c_str());