Safe guards

These will be even more important when moving to Kotlin ranges
danielgindi · Jan 23, 2020 · 4192f52 · 4192f52
1 parent d86f39c
commit 4192f52
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 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
@@ -86,6 +86,8 @@ public void calcMinMaxY(float fromX, float toX) {
         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
@@ -90,6 +90,7 @@ public void computeLegend(ChartData<?> data) {
             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();