Fix getTextCharacters to honor sourceStart offset#36914
Open
junhyeong9812 wants to merge 1 commit into
Open
Conversation
AbstractXMLStreamReader.getTextCharacters(int sourceStart, char[], int, int) capped the copy length with Math.min(length, source.length), ignoring sourceStart. When sourceStart > 0 and sourceStart + length exceeds the text length, System.arraycopy read past the end of the source array and threw ArrayIndexOutOfBoundsException, contrary to the XMLStreamReader#getTextCharacters contract (copy up to length characters starting at sourceStart and return the number copied). Cap the length by the number of characters remaining from sourceStart. Signed-off-by: junhyeong9812 <pickjog@gmail.com>
This file contains hidden or 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
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.
Overview
AbstractXMLStreamReader(the base forXMLEventStreamReader, reachable via the publicStaxUtils.createEventStreamReader(XMLEventReader)) implementsgetTextCharacters(int sourceStart, char[] target, int targetStart, int length).Problem
The copy length was capped with
Math.min(length, source.length), ignoringsourceStart:When
sourceStart > 0andsourceStart + lengthexceeds the text length,System.arraycopyreads past the end of
sourceand throwsArrayIndexOutOfBoundsException. This breaks theXMLStreamReader#getTextCharacters(int, char[], int, int)contract, which copies up tolengthcharacters starting at
sourceStartand returns the number actually copied — exactly the patterna consumer uses to read a long text node in chunks (
sourceStart += copied).Fix
Cap the length by the number of characters remaining from
sourceStart(
Math.min(length, source.length - sourceStart)). A regression test is added toXMLEventStreamReaderTests.