commit e3293c7c026ef5a120575610be9c3cb3b7d304ed
author Kelvin Zhang <zhangkelvin@google.com> Thu Nov 19 17:10:56 2020 -0500
committer Kelvin Zhang <zhangkelvin@google.com> Tue Nov 24 18:00:23 2020 -0500
tree eec1e47dcf78379f7355cec1b1049dad53de1a0b
parent 91d95fa9454d56f486e49742039ddb92e10cf054

Check for return value of ConsumeWithBuffer

Test: treehugger
Bug: 168554689

Change-Id: I1447c705143fe3d88267dcd08bbc9674d9cc6676

payload_consumer/snapshot_extent_writer.cc

diff --git a/payload_consumer/snapshot_extent_writer.cc b/payload_consumer/snapshot_extent_writer.cc
index 5693c9b..c9e6f31 100644
--- a/payload_consumer/snapshot_extent_writer.cc
+++ b/payload_consumer/snapshot_extent_writer.cc
@@ -54,8 +54,14 @@
   const auto cur_extent_size = cur_extent.num_blocks() * block_size_;
 
   if (buffer_.empty() && count >= cur_extent_size) {
-    TEST_AND_RETURN_FALSE(cow_writer_->AddRawBlocks(
-        cur_extent.start_block(), data, cur_extent_size));
+    if (!cow_writer_->AddRawBlocks(
+            cur_extent.start_block(), data, cur_extent_size)) {
+      LOG(ERROR) << "AddRawBlocks(" << cur_extent.start_block() << ", " << data
+                 << ", " << cur_extent_size << ") failed.";
+      // return value is expected to be greater than 0. Return 0 to signal error
+      // condition
+      return 0;
+    }
     if (!next_extent()) {
       CHECK_EQ(count, cur_extent_size)
           << "Exhausted all blocks, but still have " << count - cur_extent_size
@@ -75,8 +81,12 @@
   CHECK_LE(buffer_.size(), cur_extent_size);
 
   if (buffer_.size() == cur_extent_size) {
-    TEST_AND_RETURN_FALSE(cow_writer_->AddRawBlocks(
-        cur_extent.start_block(), buffer_.data(), buffer_.size()));
+    if (!cow_writer_->AddRawBlocks(
+            cur_extent.start_block(), buffer_.data(), buffer_.size())) {
+      LOG(ERROR) << "AddRawBlocks(" << cur_extent.start_block() << ", "
+                 << buffer_.data() << ", " << buffer_.size() << ") failed.";
+      return 0;
+    }
     buffer_.clear();
     if (!next_extent()) {
       CHECK_EQ(count, bytes_to_copy) << "Exhausted all blocks, but still have "
@@ -100,6 +110,7 @@
   auto data = static_cast<const uint8_t*>(bytes);
   while (count > 0) {
     auto bytes_written = ConsumeWithBuffer(data, count);
+    TEST_AND_RETURN_FALSE(bytes_written > 0);
     data += bytes_written;
     count -= bytes_written;
   }