commit daa76f60e5a11e2455803e4264118f6b1eb24af9
author Tao Bao <tbao@google.com> Fri Nov 03 03:42:31 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Nov 03 03:42:31 2017 +0000
tree a3bafdc4b8932c49057db64cb6a8dc2977133261
parent cbe3ca419c2f4b7f0e7ffa07f18869edef2e89b6
parent b03f15a8deb407f046e53f4516964a46738b5b82

Merge "fastboot: Don't give parsing error for unsupported 'getvar erase-block-size'." am: e5ff9b988c am: 5cea27baad
am: 9cd5e53128

Change-Id: I04d086e71579811285918574d288044716098a4a

fastboot/fastboot.cpp

diff --git a/fastboot/fastboot.cpp b/fastboot/fastboot.cpp
index c3b1bfb..df755aa 100644
--- a/fastboot/fastboot.cpp
+++ b/fastboot/fastboot.cpp
@@ -1354,7 +1354,7 @@
 
 static unsigned fb_get_flash_block_size(Transport* transport, std::string name) {
     std::string sizeString;
-    if (!fb_getvar(transport, name.c_str(), &sizeString)) {
+    if (!fb_getvar(transport, name.c_str(), &sizeString) || sizeString.empty()) {
         /* This device does not report flash block sizes, so return 0 */
         return 0;
     }