[JENKINS-71139] Do not even try to save NULs #521
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jglick
commented
Apr 24, 2023
| @@ -209,6 +209,10 @@ static String possiblyTrimStdio(Collection<CaseResult> results, boolean keepLong | |||
| return stdio.subSequence(0, halfMaxSize) + "\n...[truncated " + middle + " chars]...\n" + stdio.subSequence(len - halfMaxSize, len); | |||
| } | |||
|
|
|||
| static String fixNULs(String stdio) { // JENKINS-71139 | |||
| return stdio == null ? null : stdio.replace("\u0000", "^@"); | |||
There was a problem hiding this comment.
Choice of display idiom for NUL is of course negotiable; I think this format is pretty conventional in the Unix world.
There was a problem hiding this comment.
The U+FFFD � replacement character can also be used to replace an unknown, unrecognized, or unrepresentable character.
timja
approved these changes
Apr 24, 2023
6 tasks
In XML 1.1, all surrogates, U+FFFE, and U+FFFF are forbidden. I could not get Surefire to produce an XML file with a surrogate even when I tried, so I do not think that is an issue. U+FFFE and U+FFFF are guaranteed not to be Unicode characters at all; if they become a problem, they could be handled the same way this PR handles the null character. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Continues #520 by just avoiding the core regression (if it is even considered valid).
There may be other Unicode characters which cause problems in XML serialization; for purposes of this PR I am focusing just on NUL.