commit 29dd1affeef2e99f770a60db99c7268c3aaf8002
author James Kuszmaul <jabukuszmaul@gmail.com> Thu Nov 11 10:12:44 2021 -0800
committer Gerrit Code Review <gerrit@software.frc971.org> Thu Nov 11 10:12:44 2021 -0800
tree 4b964b696b6df67576d4d4bde1cac3752c99c84c
parent 53778f7a09aa64c562003e7cfc27b2e783b463bb
parent d54c77c09e74c309c9ff1147302f538c78215001

Merge "Handle some truncated logfiles more gracefully"

aos/events/logging/snappy_encoder.cc

diff --git a/aos/events/logging/snappy_encoder.cc b/aos/events/logging/snappy_encoder.cc
index d57b3dd..4621273 100644
--- a/aos/events/logging/snappy_encoder.cc
+++ b/aos/events/logging/snappy_encoder.cc
@@ -189,10 +189,10 @@
       // checking the contents.
       continue;
     } else if (chunk_type == 0x00) {
-      // Note: This section uses CHECKs rather than terminating more silently
-      // because any of these CHECK's failing implies outright data corruption
-      // rather than mere truncation.
-      CHECK_LT(4u, compressed_buffer_.size()) << ": Missing checksum.";
+      if (compressed_buffer_.size() < 4u) {
+        LOG(WARNING) << "Logfile data is truncated.";
+        break;
+      }
       const uint32_t checksum = compressed_buffer_.data()[0] +
                                 (compressed_buffer_.data()[1] << 8) +
                                 (compressed_buffer_.data()[2] << 16) +