Block bad keys in _mergerIf

chartjs · Oct 18, 2020 · 889eb16 · 889eb16
1 parent 20e10a8
commit 889eb16
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/src/helpers/helpers.core.js b/src/helpers/helpers.core.js
@@ -1,5 +1,9 @@
 'use strict';
 
+function isValidKey(key) {
+	return ['__proto__', 'prototype', 'constructor'].indexOf(key) === -1;
+}
+
 /**
  * @namespace Chart.helpers
  */
@@ -196,7 +200,7 @@ var helpers = {
 	 * @private
 	 */
 	_merger: function(key, target, source, options) {
-		if (['__proto__', 'prototype', 'constructor'].indexOf(key) !== -1) {
+		if (!isValidKey(key)) {
 			// We want to ensure we do not copy prototypes over
 			// as this can pollute global namespaces
 			return;
@@ -217,6 +221,12 @@ var helpers = {
 	 * @private
 	 */
 	_mergerIf: function(key, target, source) {
+		if (!isValidKey(key)) {
+			// We want to ensure we do not copy prototypes over
+			// as this can pollute global namespaces
+			return;
+		}
+
 		var tval = target[key];
 		var sval = source[key];