Skip to content

Fix crash in NullProtoObject() in WSH #970

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

Closed
gnh1201 wants to merge 3 commits into from
+9 −4
Closed

Fix crash in NullProtoObject() in WSH #970

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c3c2f9c
Merge pull request #1 from zloirock/master
gnh1201 Jul 29, 2021
1f688dd
Merge pull request #2 from zloirock/master
gnh1201 Aug 10, 2021
eff7159
Update object-create.js
gnh1201 Aug 10, 2021
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
13 changes: 9 additions & 4 deletions packages/core-js/internals/object-create.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,15 @@ var NullProtoObject = function () {
try {
activeXDocument = new ActiveXObject('htmlfile');
} catch (error) { /* ignore */ }
NullProtoObject = document.domain && activeXDocument ?
NullProtoObjectViaActiveX(activeXDocument) : // old IE
NullProtoObjectViaIFrame() ||
NullProtoObjectViaActiveX(activeXDocument); // WSH
if (activeXDocument) {
if (typeof(document) !== 'undefined') {
NullProtoObject = document.domain ?
NullProtoObjectViaActiveX(activeXDocument) : // old IE
NullProtoObjectViaIFrame();
} else {
NullProtoObject = NullProtoObjectViaActiveX(activeXDocument); // WSH
}
}
var length = enumBugKeys.length;
while (length--) delete NullProtoObject[PROTOTYPE][enumBugKeys[length]];
return NullProtoObject();
Expand Down