Skip to content

When objects are merged together, the target prototype can be polluted. #7918

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 18, 2020
Merged

When objects are merged together, the target prototype can be polluted. #7918

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
20e10a8
When objects are merged together, the target prototype can be polluted.
etimberg Oct 18, 2020
889eb16
Block bad keys in _mergerIf
etimberg Oct 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Block bad keys in _mergerIf
  • Loading branch information
@etimberg
etimberg committed Oct 18, 2020
commit 889eb161a440a0268b859c34e9c12f9a12446e52
12 changes: 11 additions & 1 deletion src/helpers/helpers.core.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
'use strict';

function isValidKey(key) {
return ['__proto__', 'prototype', 'constructor'].indexOf(key) === -1;
}

/**
* @namespace Chart.helpers
*/
Expand Down Expand Up @@ -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;
Expand All @@ -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];

Expand Down