Added outofbounds check in getEntryForHighlight (PhilJay#898)

unchiujar · Jul 27, 2015 · 39b4e0f · 39b4e0f
1 parent af9ac44
commit 39b4e0f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/MPChartLib/src/com/github/mikephil/charting/data/BarEntry.java b/MPChartLib/src/com/github/mikephil/charting/data/BarEntry.java
@@ -17,8 +17,7 @@ public class BarEntry extends Entry {
 	private float mPositiveSum;
 
 	/**
-	 * Constructor for stacked bar entries. Don't forget to order the stacked-values in an ascending order e.g.
-	 * (-2,-1,0,1,2).
+	 * Constructor for stacked bar entries.
 	 * 
 	 * @param vals
 	 *            - the stack values, use at lest 2
@@ -42,8 +41,7 @@ public BarEntry(float val, int xIndex) {
 	}
 
 	/**
-	 * Constructor for stacked bar entries. Don't forget to order the stacked-values in an ascending order e.g.
-	 * (-2,-1,0,1,2).
+	 * Constructor for stacked bar entries.
 	 * 
 	 * @param vals
 	 *            - the stack values, use at least 2

diff --git a/MPChartLib/src/com/github/mikephil/charting/data/ChartData.java b/MPChartLib/src/com/github/mikephil/charting/data/ChartData.java
@@ -486,7 +486,10 @@ protected String[] getDataSetLabels() {
      * @return the entry that is highlighted
      */
     public Entry getEntryForHighlight(Highlight highlight) {
-        return mDataSets.get(highlight.getDataSetIndex()).getEntryForXIndex(
+        if(highlight.getDataSetIndex() >= mDataSets.size())
+            return null;
+        else
+            return mDataSets.get(highlight.getDataSetIndex()).getEntryForXIndex(
                 highlight.getXIndex());
     }