From 6c989a3cee6b8b30c19729f7082964f7a406c1ac Mon Sep 17 00:00:00 2001 From: Dan Boxler Date: Tue, 15 Aug 2017 15:46:36 -0600 Subject: [PATCH] adding checks to make sure we don't cause an IndexOutOfBoundsException with an empty list --- .../main/java/com/github/mikephil/charting/data/DataSet.java | 2 ++ .../github/mikephil/charting/renderer/LineChartRenderer.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) 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 a96cfdcf66..1a2d40d93d 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 @@ -283,6 +283,8 @@ public T getEntryForXValue(float xValue, float closestToY) { @Override public T getEntryForIndex(int index) { + // Avoid an IndexOutOfBoundsException if we try access an item outside out list + if (index >= mValues.size()) return null; return mValues.get(index); } diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/LineChartRenderer.java b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/LineChartRenderer.java index 9921cb1ba6..84dce95131 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/LineChartRenderer.java +++ b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/LineChartRenderer.java @@ -569,7 +569,7 @@ public void drawValues(Canvas c) { y - valOffset, dataSet.getValueTextColor(j / 2)); } - if (entry.getIcon() != null && dataSet.isDrawIconsEnabled()) { + if (entry != null && entry.getIcon() != null && dataSet.isDrawIconsEnabled()) { Drawable icon = entry.getIcon();