commit 6a47dffde514b2510fac9a6842d0c1b160e42fc5
author Tao Bao <tbao@google.com> Fri Sep 25 17:12:28 2015 -0700
committer Tao Bao <tbao@google.com> Fri Sep 25 17:12:28 2015 -0700
tree 293e35115ba9b4ec70cb828b9d4fc8cda986f04b
parent 2bdac629f1d109dc79370edec8a31e20fbbe384c

updater: Skip empty lines in the transfer list file.

We have the last line being empty as a result of
android::base::Split("a\nb\n"), which leads to "missing command"
warnings in the update. Just skip all the empty lines.

Bug: 24373789
Change-Id: I5827e4600bd5cf0418d95477e4592fec47bbd3a9

updater/blockimg.cpp

diff --git a/updater/blockimg.cpp b/updater/blockimg.cpp
index ddb474f..54f2b6e 100644
--- a/updater/blockimg.cpp
+++ b/updater/blockimg.cpp
@@ -1428,6 +1428,10 @@
     // Subsequent lines are all individual transfer commands
     for (auto it = lines.cbegin() + start; it != lines.cend(); it++) {
         const std::string& line_str(*it);
+        if (line_str.empty()) {
+            continue;
+        }
+
         char* line = strdup(line_str.c_str());
         params.cmdname = strtok_r(line, " ", &params.cpos);