commit f36ff9bfe5cd6c97135d24d6c91aba95ab507198
author Tao Bao <tbao@google.com> Fri Nov 03 03:27:34 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Nov 03 03:27:34 2017 +0000
tree 098828bee33d0d754d2a345bf25402cf0fc87e52
parent 228e4cac45a12519b1b1c7bf3c9d56159c3fc26f
parent 1d4f851e71adaf920f920130e0e2cf0d23a14475

Merge "fastboot: Don't give parsing error for unsupported 'getvar erase-block-size'."

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