commit b8c3a7063d45d5e1470373cc3a8d4706d0f0509d
author Alexei Strots <alexei.strots@bluerivertech.com> Wed Apr 19 21:38:25 2023 -0700
committer Austin Schuh <austin.linux@gmail.com> Fri May 05 15:15:13 2023 -0700
tree db6bb761f7b2496f591c5f529629bbce8bbb0e9e
parent 65d0658184a5cf700a891869af7cb7dfebfe1a38

Hint on a couple of NPE crashes during log reading.

Change-Id: Ib4bbda605b491e2889bb02ee4b10a179a4e5bdd4
Signed-off-by: Austin Schuh <austin.schuh@bluerivertech.com>

aos/events/logging/log_reader.cc

diff --git a/aos/events/logging/log_reader.cc b/aos/events/logging/log_reader.cc
index 0af69c7..1d8cf18 100644
--- a/aos/events/logging/log_reader.cc
+++ b/aos/events/logging/log_reader.cc
@@ -729,6 +729,7 @@
   // running until the last node.
 
   for (std::unique_ptr<State> &state : states_) {
+    CHECK(state);
     VLOG(1) << "Start time is " << state->monotonic_start_time(0)
             << " for node " << MaybeNodeName(state->node()) << "now "
             << state->monotonic_now();

aos/events/logging/log_reader.h

diff --git a/aos/events/logging/log_reader.h b/aos/events/logging/log_reader.h
index 6a0fcea..7a11495 100644
--- a/aos/events/logging/log_reader.h
+++ b/aos/events/logging/log_reader.h
@@ -543,6 +543,7 @@
     }
 
     monotonic_clock::time_point monotonic_now() const {
+      CHECK_NOTNULL(event_loop_);
       return event_loop_->monotonic_now();
     }