Skip to content

Fix NPE when getting event handlers without JS engine [Regression] #166

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
rbri merged 9 commits into from
May 4, 2020
Merged

Fix NPE when getting event handlers without JS engine [Regression] #166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
e66a380
Fix frameset exception with no JS engine.
shapiroronny Apr 19, 2020
3364649
Fix exception when handling invalid body element with no JS engine.
shapiroronny Apr 19, 2020
df6b1bb
Revert "Fix exception when handling invalid body element with no JS e…
shapiroronny Apr 19, 2020
fe85610
Document fix.
shapiroronny Apr 19, 2020
e321cc3
Fix exception when handling invalid body element with no JS engine. (…
shapiroronny Apr 19, 2020
688311e
code style
rbri Apr 19, 2020
062e089
Merge remote-tracking branch 'upstream/master'
shapiroronny May 4, 2020
9be01f3
Fix NPE when getting event handlers without JS engine.
shapiroronny May 4, 2020
9ccbd17
Merge branch 'master' into master
shapiroronny May 4, 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
5 changes: 5 additions & 0 deletions src/changes/changes.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@
</properties>

<body>
<release version="2.40.1" date="xxxx, 2020" description="Bugfixes">
<action type="fix" dev="rbri" due-to="Ronny Shapiro">
Fix NPE getting event handlers without JS engine.
</action>
</release>
<release version="2.40.0" date="May 2, 2020" description="Bugfixes, Chrome 81, Firefox75">
<action type="add" dev="rbri" issue="161">
New WebClientConfiguration option ConnectionTimeToLive added.
Expand Down
9 changes: 6 additions & 3 deletions src/main/java/com/gargoylesoftware/htmlunit/html/HtmlElement.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -970,9 +970,12 @@ public final void removeChild(final String tagName, final int i) {
* @return true if an event handler has been defined otherwise false
*/
public final boolean hasEventHandlers(final String eventName) {
final Object jsObj = getScriptableObject();
if (jsObj instanceof EventTarget) {
return ((EventTarget) jsObj).hasEventHandlers(eventName);

if (getPage().getWebClient().isJavaScriptEngineEnabled()) {
final Object jsObj = getScriptableObject();
if (jsObj instanceof EventTarget) {
return ((EventTarget) jsObj).hasEventHandlers(eventName);
}
}
return false;
}
Expand Down
18 changes: 18 additions & 0 deletions src/test/java/com/gargoylesoftware/htmlunit/WebClient8Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,4 +350,22 @@ public void frameSetWithNoJS() throws Exception {
loadPage(webClient, html, null, URL_FIRST);
}
}

/**
* @throws Exception if something goes wrong
*/
@Test
public void imageEventHandlersWithNoJs() throws Exception {
final String html = "<html>\n"
+ "<head>\n"
+ "</head>\n"
+ "<body>\n"
+ "<img onerror='doSomething(this)' />\n"
+ "</body>\n"
+ "</html>";

try (WebClient webClient = new WebClient(getBrowserVersion(), false, null, -1)) {
loadPage(webClient, html, null, URL_FIRST);
}
}
}