Merge "Ignore log files with corrupted headers too"

frc971 · Dec 12, 2020 · 61b9e3f · 61b9e3f
2 parents 89597d5 + e09beb1
commit 61b9e3f
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/aos/events/logging/logfile_utils.cc b/aos/events/logging/logfile_utils.cc
@@ -362,7 +362,11 @@ std::optional<SizePrefixedFlatbufferVector<LogFileHeader>> ReadHeader(
   ResizeableBuffer data;
   data.resize(config_data.size());
   memcpy(data.data(), config_data.begin(), data.size());
-  return SizePrefixedFlatbufferVector<LogFileHeader>(std::move(data));
+  SizePrefixedFlatbufferVector<LogFileHeader> result(std::move(data));
+  if (!result.Verify()) {
+    return std::nullopt;
+  }
+  return result;
 }
 
 std::optional<SizePrefixedFlatbufferVector<MessageHeader>> ReadNthMessage(
@@ -382,7 +386,11 @@ std::optional<SizePrefixedFlatbufferVector<MessageHeader>> ReadNthMessage(
   ResizeableBuffer data;
   data.resize(data_span.size());
   memcpy(data.data(), data_span.begin(), data.size());
-  return SizePrefixedFlatbufferVector<MessageHeader>(std::move(data));
+  SizePrefixedFlatbufferVector<MessageHeader> result(std::move(data));
+  if (!result.Verify()) {
+    return std::nullopt;
+  }
+  return result;
 }
 
 MessageReader::MessageReader(std::string_view filename)