-
Notifications
You must be signed in to change notification settings - Fork 5.8k
JDK-8305710: Line breaks in search tags cause invalid JSON in index file #14016
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.
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
Conversation
👋 Welcome back hannesw! A progress list of the required criteria for merging this PR into |
Webrevs
|
@hns This change now passes all automated pre-integration checks. ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details. After integration, the commit message for the final commit will be:
You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed. At the time when this comment was updated there had been 139 new commits pushed to the
As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details. ➡️ To integrate this PR with the above commit message to the |
/integrate |
Going to push as commit 3272e25.
Your commit was automatically rebased without conflicts. |
This fixes a number of issues that can or could result in invalid JavaScript search index files, and a single invalid index file breaking the whole JavaDoc search feature.
IndexItem
now throwsIllegalArgumentException
if the label argument contains a line break. This was the original cause for this bug and was already fixed in JDK-8305407, but it is a good idea to add the explicit check to fail in a visible way should it occur again.IndexItem.escapeQuotes(String)
method now escapes backslashes in addition to quote. Failure to escape a trailing backslash would result in an escaped quote, leading to an invalid index file.Note that the added test covers only the second item in the list above. The other two changes are trivial and would require undue effort to test.
I also removed a few
boolean
parameters from test methods inTestSearch.java
that are always called withtrue
as value.Progress
Issue
Reviewers
Reviewing
Using
git
Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/14016/head:pull/14016
$ git checkout pull/14016
Update a local copy of the PR:
$ git checkout pull/14016
$ git pull https://git.openjdk.org/jdk.git pull/14016/head
Using Skara CLI tools
Checkout this PR locally:
$ git pr checkout 14016
View PR using the GUI difftool:
$ git pr show -t 14016
Using diff file
Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/14016.diff
Webrev
Link to Webrev Comment