From c7b0a4855093020bde01428d0a93cb220aef1c9c Mon Sep 17 00:00:00 2001
From: Ben Grabow <ben.grabow@gmail.com>
Date: Wed, 7 Dec 2016 17:50:55 -0600
Subject: [PATCH 1/2] Fix crash when merging activities.

We now place a reasonable upper limit on the number of ticks shown
on an AllPlot chart to prevent unbounded memory allocation and
crash when one of the activities to be merged has a wide data range
due to large anomalous data points.
---
 src/Charts/AllPlot.cpp | 39 +++++++++++++++++----------------------
 src/Charts/AllPlot.h   |  1 +
 2 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/src/Charts/AllPlot.cpp b/src/Charts/AllPlot.cpp
index 666afc24a..9b54f63bc 100644
--- a/src/Charts/AllPlot.cpp
+++ b/src/Charts/AllPlot.cpp
@@ -48,6 +48,7 @@
 #include <qwt_text.h>
 #include <qwt_legend.h>
 #include <qwt_series_data.h>
+#include <qwt_scale_engine.h>
 
 #include "qwt_plot_gapped_curve.h"
 
@@ -2698,6 +2699,16 @@ AllPlot::replot() {
         QwtPlot::replot();
     }
 
+void
+AllPlot::setAxisScaleDiv(const QwtAxisId& axis, double min, double max, double step) {
+    int maxMajorTicks = 0;
+    int maxMinorTicks = 0;
+    QwtPlot::setAxisScaleDiv(axis, 
+        QwtLinearScaleEngine().divideScale(
+            min, max, maxMajorTicks, maxMinorTicks, step)
+    );
+}
+
 void
 AllPlot::setYMax()
 {
@@ -2793,12 +2804,8 @@ AllPlot::setYMax()
                 while( ( qCeil(maxY / step) * labelWidth ) > axisHeight ) nextStep(step);
         }
 
-        QwtValueList xytick[QwtScaleDiv::NTickTypes];
-        for (int i=0;i<maxY && i<2000;i+=step)
-            xytick[QwtScaleDiv::MajorTick]<<i;
-
         setAxisTitle(yLeft, tr("Watts"));
-        setAxisScaleDiv(QwtPlot::yLeft,QwtScaleDiv(0.0,maxY,xytick));
+        AllPlot::setAxisScaleDiv(QwtPlot::yLeft, 0, maxY, step);
         axisWidget(yLeft)->update();
     }
 
@@ -2865,10 +2872,6 @@ AllPlot::setYMax()
                 while((qCeil(ymax / step) * labelWidth) > axisHeight) nextStep(step);
         }
 
-        QwtValueList xytick[QwtScaleDiv::NTickTypes];
-        for (int i=0;i<ymax;i+=step)
-            xytick[QwtScaleDiv::MajorTick]<<i;
-
         setAxisTitle(QwtAxisId(QwtAxis::yLeft, 1), labels.join(" / "));
 
         if (labels.count() == 1 && labels[0] == tr("Core Temperature")) {
@@ -2886,8 +2889,7 @@ AllPlot::setYMax()
             setAxisScale(QwtAxisId(QwtAxis::yLeft, 1),ymin<100.0f?ymin:0, ymax, step);
 
         } else {
-
-            setAxisScaleDiv(QwtAxisId(QwtAxis::yLeft, 1),QwtScaleDiv(ymin, ymax, xytick));
+            AllPlot::setAxisScaleDiv(QwtAxisId(QwtAxis::yLeft, 1), ymin, ymax, step);
         }
     }
 
@@ -2984,10 +2986,6 @@ AllPlot::setYMax()
                 while((qCeil(ymax / step) * labelWidth) > axisHeight) nextStep(step);
         }
 
-        QwtValueList xytick[QwtScaleDiv::NTickTypes];
-        for (int i=0;i<ymax;i+=step)
-            xytick[QwtScaleDiv::MajorTick]<<i;
-
         setAxisTitle(QwtAxisId(QwtAxis::yRight, 0), labels.join(" / "));
 
         // we just have Hb ?
@@ -3010,8 +3008,9 @@ AllPlot::setYMax()
             // we just have Hb ...
             setAxisScale(QwtAxisId(QwtAxis::yRight, 0),ymin<100.0f?ymin:0, ymax, step);
 
-        } else 
-            setAxisScaleDiv(QwtAxisId(QwtAxis::yRight, 0),QwtScaleDiv(0, ymax, xytick));
+        } else {
+            AllPlot::setAxisScaleDiv(QwtAxisId(QwtAxis::yRight, 0), ymin, ymax, step);
+        }
     }
 
     // QwtAxis::yRight, 1
@@ -3039,11 +3038,7 @@ AllPlot::setYMax()
                 while( ( qCeil( (ymax - ymin ) / step) * labelWidth ) > axisHeight ) nextStep(step);
         }
 
-        QwtValueList xytick[QwtScaleDiv::NTickTypes];
-        for (int i=ymin;i<ymax;i+=step)
-            xytick[QwtScaleDiv::MajorTick]<<i;
-
-        setAxisScaleDiv(QwtAxisId(QwtAxis::yRight, 1),QwtScaleDiv(ymin,ymax,xytick));
+        AllPlot::setAxisScaleDiv(QwtAxisId(QwtAxis::yRight, 1), ymin, ymax, step);
         standard->altCurve->setBaseline(ymin);
     }
 
diff --git a/src/Charts/AllPlot.h b/src/Charts/AllPlot.h
index ae283b3f0..c9ffa4170 100644
--- a/src/Charts/AllPlot.h
+++ b/src/Charts/AllPlot.h
@@ -750,6 +750,7 @@ class AllPlot : public QwtPlot
         QFont labelFont;
 
         void setAltSlopePlotStyle (AllPlotSlopeCurve *curve);
+        void setAxisScaleDiv(const QwtAxisId&, double, double, double);
         static inline void nextStep( int& step ) {
             if (step >= 5000)
             {

From d62612dbef7ff208fe5a0e0fbf65f59c99c33ba1 Mon Sep 17 00:00:00 2001
From: Ben Grabow <ben.grabow@gmail.com>
Date: Wed, 7 Dec 2016 18:00:14 -0600
Subject: [PATCH 2/2] Remove unused header reference.

---
 src/Charts/AllPlot.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Charts/AllPlot.cpp b/src/Charts/AllPlot.cpp
index 9b54f63bc..15a8e31bb 100644
--- a/src/Charts/AllPlot.cpp
+++ b/src/Charts/AllPlot.cpp
@@ -44,7 +44,6 @@
 #include <qwt_plot_marker.h>
 #include <qwt_scale_div.h>
 #include <qwt_scale_widget.h>
-#include <qwt_compat.h>
 #include <qwt_text.h>
 #include <qwt_legend.h>
 #include <qwt_series_data.h>