Skip to content

fix(helpers): resolveObjectKey returns wrong value for Object.prototype keys #12286

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

Open
contactjawad wants to merge 1 commit into
base: master
Choose a base branch
from
+14 −7
Open

fix(helpers): resolveObjectKey returns wrong value for Object.prototype keys #12286

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 8 additions & 7 deletions src/helpers/helpers.core.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,13 +333,14 @@ export function _deprecated(scope: string, value: unknown, previous: string, cur
}

// resolveObjectKey resolver cache
const keyResolvers = {
// Chart.helpers.core resolveObjectKey should resolve empty key to root object
'': v => v,
// default resolvers
x: o => o.x,
y: o => o.y
};
// Use a null-prototype object so keys colliding with Object.prototype members
// (e.g. 'toString', 'hasOwnProperty', '__proto__') don't resolve to inherited values.
const keyResolvers = Object.create(null);
// Chart.helpers.core resolveObjectKey should resolve empty key to root object
keyResolvers[''] = v => v;
// default resolvers
keyResolvers.x = o => o.x;
keyResolvers.y = o => o.y;

/**
* @private
Expand Down
6 changes: 6 additions & 0 deletions test/specs/helpers.core.tests.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -471,6 +471,12 @@ describe('Chart.helpers.core', function() {
}, 'a.bb\\.ccc')).toEqual('works');
});

it('should resolve keys that collide with Object.prototype members', function() {
expect(helpers.resolveObjectKey({toString: 5}, 'toString')).toEqual(5);
expect(helpers.resolveObjectKey({hasOwnProperty: 42}, 'hasOwnProperty')).toEqual(42);
expect(helpers.resolveObjectKey({valueOf: 7}, 'valueOf')).toEqual(7);
});

});

describe('_splitKey', function() {
Expand Down