Skip to content

fix(zone.js): harden zoneSymbolEventNames and patches against __proto__ key #69320

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
arturovt wants to merge 1 commit into
base: main
Choose a base branch
from
+8 −6
Open

fix(zone.js): harden zoneSymbolEventNames and patches against __proto__ key #69320

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
3 changes: 2 additions & 1 deletion packages/zone.js/lib/common/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,8 @@ export const isMix: boolean =
!isWebWorker &&
!!(isWindowExists && internalWindow['HTMLElement']);

const zoneSymbolEventNames: {[eventName: string]: string} = {};
// tslint:disable-next-line:no-toplevel-property-access
const zoneSymbolEventNames: {[eventName: string]: string} = Object.create(null);

const enableBeforeunloadSymbol = zoneSymbol('enable_beforeunload');

Expand Down
4 changes: 2 additions & 2 deletions packages/zone.js/lib/zone-impl.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -814,7 +814,7 @@ export function initZone(): ZoneType {
}

static __load_patch(name: string, fn: PatchFn, ignoreDuplicate = false): void {
if (patches.hasOwnProperty(name)) {
if (Object.hasOwn(patches, name)) {
// `checkDuplicate` option is defined from global variable
// so it works for all modules.
// `ignoreDuplicate` can work for the specified module
Expand Down Expand Up @@ -1601,7 +1601,7 @@ export function initZone(): ZoneType {
macroTask: 'macroTask' = 'macroTask',
eventTask: 'eventTask' = 'eventTask';

const patches: {[key: string]: any} = {};
const patches: {[key: string]: any} = Object.create(null);
const _api: ZonePrivate = {
symbol: __symbol__,
currentZoneFrame: () => _currentZoneFrame,
Expand Down
7 changes: 4 additions & 3 deletions packages/zone.js/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@
"es2015.iterable",
"es2015.promise",
"es2015.symbol",
"es2015.symbol.wellknown"
],
},
"es2015.symbol.wellknown",
"es2022.object"
]
}
}
Loading