Fix #1535

PhilJay · Mar 2, 2016 · 2600018 · danielgindi · Mar 2, 2016 · PhilJay
1 parent a990ed7
commit 2600018
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/MPChartLib/src/com/github/mikephil/charting/highlight/BarHighlighter.java b/MPChartLib/src/com/github/mikephil/charting/highlight/BarHighlighter.java
@@ -105,8 +105,10 @@ protected Highlight getStackedHighlight(Highlight old, IBarDataSet set, int xInd
 		Range[] ranges = getRanges(entry);
 		int stackIndex = getClosestStackIndex(ranges, (float) yValue);
 
-		Highlight h = new Highlight(xIndex, dataSetIndex, stackIndex, ranges[stackIndex]);
-		return h;
+		if(ranges.length > 0)
+			return new Highlight(xIndex, dataSetIndex, stackIndex, ranges[stackIndex]);
+		else
+			return null;
 	}
 
 	/**
@@ -187,15 +189,14 @@ protected float getBase(float x) {
 	protected Range[] getRanges(BarEntry entry) {
 
 		float[] values = entry.getVals();
+		Range[] ranges = new Range[values.length];
 
 		if (values == null || values.length == 0)
-			return null;
+			return ranges;
 
 		float negRemain = -entry.getNegativeSum();
 		float posRemain = 0f;
 
-		Range[] ranges = new Range[values.length];
-
 		for (int i = 0; i < ranges.length; i++) {
 
 			float value = values[i];