Error if style is null (#4781)

I tested in Chrome and when style(line 50) is null, style.toString is undefined Reason: typeof null equals "object" (at least in Chrome)
chartjs · Sep 29, 2017 · b94532c · b94532c
1 parent 8a4ac1e
commit b94532c
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/helpers/helpers.canvas.js b/src/helpers/helpers.canvas.js
@@ -47,7 +47,7 @@ var exports = module.exports = {
 	drawPoint: function(ctx, style, radius, x, y) {
 		var type, edgeLength, xOffset, yOffset, height, size;
 
-		if (typeof style === 'object') {
+		if (style && typeof style === 'object') {
 			type = style.toString();
 			if (type === '[object HTMLImageElement]' || type === '[object HTMLCanvasElement]') {
 				ctx.drawImage(style, x - style.width / 2, y - style.height / 2, style.width, style.height);