Merge pull request f4exb#2277 from srcejon/fix_2083

HeatMap: Fix crash when out of memory
srcejon · Oct 12, 2024 · 141d0c1 · 141d0c1
2 parents f169cb5 + 1654642
commit 141d0c1
Showing 1 changed file with 22 additions and 14 deletions.
diff --git a/plugins/channelrx/heatmap/heatmapgui.cpp b/plugins/channelrx/heatmap/heatmapgui.cpp
@@ -1506,21 +1506,29 @@ void HeatMapGUI::addToPowerSeries(QDateTime dateTime, double average, double pul
 {
     if (m_powerAverageSeries)
     {
-        qint64 msecs = dateTime.toMSecsSinceEpoch();
-        if (!std::isnan(average)) {
-            m_powerAverageSeries->append(msecs, average);
-        }
-        if (!std::isnan(pulseAverage)) {
-            m_powerPulseAverageSeries->append(msecs, pulseAverage);
-        }
-        if (!std::isnan(max)) {
-            m_powerMaxPeakSeries->append(msecs, max);
-        }
-        if (!std::isnan(min)) {
-            m_powerMinPeakSeries->append(msecs, min);
+        try
+        {
+            qint64 msecs = dateTime.toMSecsSinceEpoch();
+            if (!std::isnan(average)) {
+                m_powerAverageSeries->append(msecs, average);
+            }
+            if (!std::isnan(pulseAverage)) {
+                m_powerPulseAverageSeries->append(msecs, pulseAverage);
+            }
+            if (!std::isnan(max)) {
+                m_powerMaxPeakSeries->append(msecs, max);
+            }
+            if (!std::isnan(min)) {
+                m_powerMinPeakSeries->append(msecs, min);
+            }
+            if (!std::isnan(pathLoss)) {
+                m_powerPathLossSeries->append(msecs, pathLoss);
+            }
         }
-        if (!std::isnan(pathLoss)) {
-            m_powerPathLossSeries->append(msecs, pathLoss);
+        catch (std::bad_alloc&)
+        {
+           QMessageBox::critical(this, "Heat Map", QString("Failed to allocate memory for chart series"));
+           ui->displayChart->setChecked(false);
         }
     }
 }