From eb805e889ef2f9c6e1345dc164533b44494576d0 Mon Sep 17 00:00:00 2001
From: Robbe Derks <robbe.derks@gmail.com>
Date: Sun, 31 Dec 2023 22:02:05 +0100
Subject: [PATCH] [Cabana] Fix segfault in sparkline (#30870)

---
 tools/cabana/chart/sparkline.cc | 35 ++++++++++++++++++++-------------
 1 file changed, 21 insertions(+), 14 deletions(-)

diff --git a/tools/cabana/chart/sparkline.cc b/tools/cabana/chart/sparkline.cc
index 42608c030f..34bc76b7c4 100644
--- a/tools/cabana/chart/sparkline.cc
+++ b/tools/cabana/chart/sparkline.cc
@@ -13,23 +13,30 @@ void Sparkline::update(const MessageId &msg_id, const cabana::Signal *sig, doubl
   auto first = std::lower_bound(msgs.cbegin(), msgs.cend(), first_ts, CompareCanEvent());
   auto last = std::upper_bound(first, msgs.cend(), ts, CompareCanEvent());
 
-  if (first != last && !size.isEmpty()) {
-    points.clear();
-    double value = 0;
-    for (auto it = first; it != last; ++it) {
-      if (sig->getValue((*it)->dat, (*it)->size, &value)) {
-        points.emplace_back(((*it)->mono_time - (*first)->mono_time) / 1e9, value);
-      }
+  if (first == last || size.isEmpty()) {
+    pixmap = QPixmap();
+    return;
+  }
+
+  points.clear();
+  double value = 0;
+  for (auto it = first; it != last; ++it) {
+    if (sig->getValue((*it)->dat, (*it)->size, &value)) {
+      points.emplace_back(((*it)->mono_time - (*first)->mono_time) / 1e9, value);
     }
-    const auto [min, max] = std::minmax_element(points.begin(), points.end(),
-                                                [](auto &l, auto &r) { return l.y() < r.y(); });
-    min_val = min->y() == max->y() ? min->y() - 1 : min->y();
-    max_val = min->y() == max->y() ? max->y() + 1 : max->y();
-    freq_ = points.size() / std::max(points.back().x() - points.front().x(), 1.0);
-    render(sig->color, range, size);
-  } else {
+  }
+
+  if (points.empty()) {
     pixmap = QPixmap();
+    return;
   }
+
+  const auto [min, max] = std::minmax_element(points.begin(), points.end(),
+                                              [](auto &l, auto &r) { return l.y() < r.y(); });
+  min_val = min->y() == max->y() ? min->y() - 1 : min->y();
+  max_val = min->y() == max->y() ? max->y() + 1 : max->y();
+  freq_ = points.size() / std::max(points.back().x() - points.front().x(), 1.0);
+  render(sig->color, range, size);
 }
 
 void Sparkline::render(const QColor &color, int range, QSize size) {