diff options
Diffstat (limited to 'updater/blockimg.cpp')
-rw-r--r-- | updater/blockimg.cpp | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/updater/blockimg.cpp b/updater/blockimg.cpp index f2811bccf..1646b7c17 100644 --- a/updater/blockimg.cpp +++ b/updater/blockimg.cpp @@ -1628,9 +1628,10 @@ static Value* PerformBlockImageUpdate(const char* name, State* state, } } + static constexpr size_t kTransferListHeaderLines = 4; std::vector<std::string> lines = android::base::Split(transfer_list_value->data, "\n"); - if (lines.size() < 2) { - ErrorAbort(state, kArgsParsingFailure, "too few lines in the transfer list [%zd]", + if (lines.size() < kTransferListHeaderLines) { + ErrorAbort(state, kArgsParsingFailure, "too few lines in the transfer list [%zu]", lines.size()); return StringValue(""); } @@ -1654,12 +1655,6 @@ static Value* PerformBlockImageUpdate(const char* name, State* state, return StringValue("t"); } - if (lines.size() < 4) { - ErrorAbort(state, kArgsParsingFailure, "too few lines in the transfer list [%zu]", - lines.size()); - return StringValue(""); - } - // Third line is how many stash entries are needed simultaneously. LOG(INFO) << "maximum stash entries " << lines[2]; @@ -1698,7 +1693,6 @@ static Value* PerformBlockImageUpdate(const char* name, State* state, int rc = -1; - static constexpr size_t kTransferListHeaderLines = 4; // Subsequent lines are all individual transfer commands for (size_t i = kTransferListHeaderLines; i < lines.size(); i++) { const std::string& line = lines[i]; |