CONFSERVER-82911 Back-port https://github.com/hunterhacker/jdom/pull/188 #1
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
rjatkins
reviewed
Jul 18, 2023
| String name = (String)iter.next(); | ||
| Boolean value = (Boolean)features.get(name); | ||
| internalSetFeature(parser, name, value.booleanValue(), name); | ||
| } |
There was a problem hiding this comment.
Should also remove the redundant setting of user-specified features from above this
There was a problem hiding this comment.
Done. I didn't do that initially just to minimise the code change, but that's ok.
rjatkins
requested changes
Jul 18, 2023
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.
Back-porting the above PR from JDOM 2.x upstream.
It's not a simple cherry-pick, since there have been too many intervening code changes, but the essence of it is simple.
The bug is that if client code sets the
http://xml.org/sax/features/external-general-entitiesfeature on theSAXBuilder, this can be silently over-written based on the value of theexpandproperty ofSAXBuilder. The upstream PR moves the logic which sets the features from before theexpandlogic, to after after.There's also the added unit test, which verifies the fix.