commit 4c6c96a59566e8e876cc803be84c16d3f04f31d4
author Tao Bao <tbao@google.com> Wed Sep 30 23:59:57 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Sep 30 23:59:57 2015 +0000
tree 3e94386b86ae759d2a6f8605f918785173a92711
parent 6eb2668de1afca57b7c64532f98f84b7fcec1f60
parent 245b2da1711db8a9b8e333395d68235df5163483

am 245b2da1: am 754ebaa9: Merge "updater: Skip empty lines in the transfer list file."

* commit '245b2da1711db8a9b8e333395d68235df5163483':
  updater: Skip empty lines in the transfer list file.

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