From 3443b774155abb2e1d8583b11a8fc87ffa64c1ef Mon Sep 17 00:00:00 2001
From: Josh Gao <jmgao@google.com>
Date: Wed, 3 Apr 2019 12:56:22 -0700
Subject: [PATCH] adb: defuse CHECK on IOVector::append of an empty block.

Bug: http://b/129706741
Test: treehugger
Change-Id: I35a35d20d179a155adb4fe83078739fcaf517136
---
 adb/types.h | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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