From 4192f52d2185b7c7c9fb3e1bfd6387b7571ede72 Mon Sep 17 00:00:00 2001
From: Daniel Cohen Gindi <danielgindi@gmail.com>
Date: Wed, 22 Jan 2020 09:55:00 +0200
Subject: [PATCH] Safe guards

These will be even more important when moving to Kotlin ranges
---
 .../main/java/com/github/mikephil/charting/data/DataSet.java    | 2 ++
 .../com/github/mikephil/charting/renderer/LegendRenderer.java   | 1 +
 2 files changed, 3 insertions(+)

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 3c69d9c58f..b474bfd894 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 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
index 85597db6a1..4e7e5d6448 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 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();