Skip to content

8282134: Certain regex can cause a JS trap in WebView #835

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
johanvos wants to merge 1 commit into from
Closed

8282134: Certain regex can cause a JS trap in WebView #835

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
2 changes: 1 addition & 1 deletion modules/javafx.web/src/main/native/Source/JavaScriptCore/yarr/YarrJIT.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2135,7 +2135,7 @@ class YarrGenerator final : public YarrJITInfo, private MacroAssembler {

if (!nonGreedyFailuresDecrementIndex.empty()) {
nonGreedyFailuresDecrementIndex.link(this);
breakpoint();
sub32(TrustedImm32(1), index);
}
nonGreedyFailures.link(this);
sub32(countRegister, index);
Expand Down
8 changes: 8 additions & 0 deletions modules/javafx.web/src/test/java/test/javafx/scene/web/LoadTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -423,4 +423,12 @@ public void onError() {
throw new AssertionError(ex);
}
}

// JDK-8282134 Certain regex can cause a JS trap in WebView
@Test public void jsRegexpTrapTest() {
final String FILE = "src/test/resources/test/html/unicode.html";
load(new File(FILE));
WebEngine web = getEngine();
assertTrue("Load task completed successfully", getLoadState() == SUCCEEDED);
}
}
13 changes: 13 additions & 0 deletions modules/javafx.web/src/test/resources/test/html/unicode.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<!DOCTYPE html>
<html>
<body>
<script>
let a = "\ud800\ud800\udc00"
let b = /(.*[^x]+?)[^]*([1])/u
b.exec(a)
</script>

<p id="regtest">PASS</p>

</body>
</html>