Skip to content
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

Prevent uninitialized getter js object #376

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
+12 −0
Open

Prevent uninitialized getter js object #376

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4b3b20a
Merge pull request #1 from HtmlUnit/master
cdalexndr Jan 3, 2021
89d9ac7
Merge pull request #2 from HtmlUnit/master
cdalexndr Jan 9, 2021
13ba964
Merge pull request #3 from HtmlUnit/master
cdalexndr Apr 23, 2021
3916581
Merge branch 'HtmlUnit:master' into master
cdalexndr Aug 30, 2021
2cbde0a
prevent uninitialized js objects
cdalexndr Aug 30, 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
12 changes: 12 additions & 0 deletions src/main/java/com/gargoylesoftware/htmlunit/javascript/SimpleScriptable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,18 @@ public Object get(String name, final Scriptable start) {
// Try to get property configured on object itself.
Object response = super.get(name, start);
if (response != NOT_FOUND) {
if (response instanceof ScriptableObject) {
ScriptableObject responseScriptable = (ScriptableObject) response;
if (responseScriptable.getParentScope() == null) {
responseScriptable.setParentScope(this.getParentScope());
}
}
if (response instanceof SimpleScriptable) {
SimpleScriptable simpleScriptable = (SimpleScriptable) response;
if (simpleScriptable.getPrototype() == null) {
simpleScriptable.setPrototype(getPrototype(simpleScriptable.getClass()));
}
}
return response;
}
if (this == start) {
Expand Down