diff options
| author | Daniel Cohen Gindi <danielgindi@gmail.com> | 2020-01-22 09:55:00 +0200 |
|---|---|---|
| committer | Daniel Cohen Gindi <danielgindi@gmail.com> | 2020-01-22 09:55:00 +0200 |
| commit | 95027fa6a7f4762d52ffa23cabd45135d7d26ff4 (patch) | |
| tree | 0ad248cba1d4a3365f097c5e2ee382ea66b7cb6f | |
| parent | d86f39cc917ced800fdd93dafe3da886686822f2 (diff) | |
| download | MPAndroidChart-95027fa6a7f4762d52ffa23cabd45135d7d26ff4.tar.gz | |
Safe guards
These will be even more important when moving to Kotlin ranges
| -rw-r--r-- | MPChartLib/src/main/java/com/github/mikephil/charting/data/DataSet.java | 2 | ||||
| -rw-r--r-- | MPChartLib/src/main/java/com/github/mikephil/charting/renderer/LegendRenderer.java | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/data/DataSet.java b/MPChartLib/src/main/java/com/github/mikephil/charting/data/DataSet.java index 3c69d9c5..b474bfd8 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/data/DataSet.java +++ b/MPChartLib/src/main/java/com/github/mikephil/charting/data/DataSet.java @@ -86,6 +86,8 @@ public abstract class DataSet<T extends Entry> extends BaseDataSet<T> { int indexFrom = getEntryIndex(fromX, Float.NaN, Rounding.DOWN); int indexTo = getEntryIndex(toX, Float.NaN, Rounding.UP); + if (indexTo < indexFrom) return; + for (int i = indexFrom; i <= indexTo; i++) { // only recalculate y diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/LegendRenderer.java b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/LegendRenderer.java index 85597db6..4e7e5d64 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/LegendRenderer.java +++ b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/LegendRenderer.java @@ -90,6 +90,7 @@ public class LegendRenderer extends Renderer { for (int i = 0; i < data.getDataSetCount(); i++) { IDataSet dataSet = data.getDataSetByIndex(i); + if (dataSet == null) continue; List<Integer> clrs = dataSet.getColors(); int entryCount = dataSet.getEntryCount(); |