Avoid crash when dataset is empty

DzonyKalafut · Oct 10, 2016 · 555176b · 555176b
1 parent e106289
commit 555176b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/...c/main/java/com/github/mikephil/charting/renderer/BarLineScatterCandleBubbleRenderer.java b/...c/main/java/com/github/mikephil/charting/renderer/BarLineScatterCandleBubbleRenderer.java
@@ -88,8 +88,8 @@ public void set(BarLineScatterCandleBubbleDataProvider chart, IBarLineScatterCan
             Entry entryFrom = dataSet.getEntryForXValue(low, Float.NaN, DataSet.Rounding.DOWN);
             Entry entryTo = dataSet.getEntryForXValue(high, Float.NaN, DataSet.Rounding.UP);
 
-            min = dataSet.getEntryIndex(entryFrom);
-            max = dataSet.getEntryIndex(entryTo);
+            min = entryFrom == null ? 0 : dataSet.getEntryIndex(entryFrom);
+            max = entryTo == null ? 0 : dataSet.getEntryIndex(entryTo);
             range = (int) ((max - min) * phaseX);
         }
     }

diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/utils/Transformer.java b/MPChartLib/src/main/java/com/github/mikephil/charting/utils/Transformer.java
@@ -171,7 +171,7 @@ public float[] generateTransformedValuesBubble(IBubbleDataSet data, float phaseY
     public float[] generateTransformedValuesLine(ILineDataSet data,
                                                  float phaseX, float phaseY, int from, int to) {
 
-        final int count = (int) ((to - from) * phaseX + 1) * 2;
+        final int count = (int) ((to - from) * phaseX) * 2;
 
         if (valuePointsForGenerateTransformedValuesLine.length != count) {
             valuePointsForGenerateTransformedValuesLine = new float[count];