ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "adb: defuse CHECK on IOVector::append of an empty block."

Browse source
This commit is contained in:
Treehugger Robot 2019-04-04 21:02:02 +00:00 • committed by Gerrit Code Review
commit 5c58e092f3
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
adb/types.h
View file

@ -216,7 +216,10 @@ struct IOVector {
// Add a nonempty block to the chain. // Add a nonempty block to the chain.
// The end of the chain must be a complete block (i.e. end_offset_ == 0). // The end of the chain must be a complete block (i.e. end_offset_ == 0).
void append(std::unique_ptr<const block_type> block) { void append(std::unique_ptr<const block_type> block) {
CHECK_NE(0ULL, block->size()); if (block->size() == 0) {
return;
}
CHECK_EQ(0ULL, end_offset_); CHECK_EQ(0ULL, end_offset_);
chain_length_ += block->size(); chain_length_ += block->size();
chain_.emplace_back(std::move(block)); chain_.emplace_back(std::move(block));