diff options
| author | Tao Bao <tbao@google.com> | 2015-10-01 01:44:35 +0200 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-10-01 01:44:35 +0200 |
| commit | 245b2da1711db8a9b8e333395d68235df5163483 (patch) | |
| tree | 8658d4091c3b8348e0846b3941a0b8abf459c4f2 | |
| parent | am 4b66a280: Merge "minadbd: use strdup() to create argument for sideload thread." (diff) | |
| parent | Merge "updater: Skip empty lines in the transfer list file." (diff) | |
| download | android_bootable_recovery-245b2da1711db8a9b8e333395d68235df5163483.tar android_bootable_recovery-245b2da1711db8a9b8e333395d68235df5163483.tar.gz android_bootable_recovery-245b2da1711db8a9b8e333395d68235df5163483.tar.bz2 android_bootable_recovery-245b2da1711db8a9b8e333395d68235df5163483.tar.lz android_bootable_recovery-245b2da1711db8a9b8e333395d68235df5163483.tar.xz android_bootable_recovery-245b2da1711db8a9b8e333395d68235df5163483.tar.zst android_bootable_recovery-245b2da1711db8a9b8e333395d68235df5163483.zip | |
| -rw-r--r-- | updater/blockimg.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/updater/blockimg.cpp b/updater/blockimg.cpp index ddb474ffd..54f2b6ed7 100644 --- a/updater/blockimg.cpp +++ b/updater/blockimg.cpp @@ -1428,6 +1428,10 @@ static Value* PerformBlockImageUpdate(const char* name, State* state, int /* arg // 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, " ", ¶ms.cpos); |