From: Tiago Roldão <focus5.6@gmail.com>
Date: Mon, 18 Jul 2016 21:05:44 +0000 (+0100)
Subject: Check for existence of data element before accessing property
X-Git-Tag: v2.2.0-rc.2~5^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F2991%2Fhead;p=thirdparty%2FChart.js.git

Check for existence of data element before accessing property
---

diff --git a/src/core/core.controller.js b/src/core/core.controller.js
index 4794cf80a..398d40d2b 100644
--- a/src/core/core.controller.js
+++ b/src/core/core.controller.js
@@ -413,9 +413,10 @@ module.exports = function(Chart) {
 
 			helpers.each(me.data.datasets, function(dataset, datasetIndex) {
 				if (me.isDatasetVisible(datasetIndex)) {
-					var meta = me.getDatasetMeta(datasetIndex);
-					if(!meta.data[found._index]._view.skip){
-						elementsArray.push(meta.data[found._index]);
+					var meta = me.getDatasetMeta(datasetIndex),
+						element = meta.data[found._index];
+					if(element && !element._view.skip){
+						elementsArray.push(element);
 					}
 				}
 			}, me);