reject negative annotation counts in XsbReader index loader#89
Open
aizu-m wants to merge 1 commit into
Open
Conversation
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
1 participant
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.
Loading a compiled schema whose annotation section carries a crafted count:
readAnnotation and readAnnotations size three arrays and an ArrayList straight from a signed readInt() count in the .xsb stream. Only -1 is handled, the null-annotation marker. Any other negative count from a corrupt or crafted index throws NegativeArraySizeException here, and new ArrayList<>(n) in readAnnotations throws IllegalArgumentException. initFromHeader reads the annotations inside a plain try/finally and the SchemaTypeSystemImpl constructor only logs and rethrows, so this leaves the loader as a raw runtime exception rather than SchemaTypeLoaderException.
Found while walking the readInt sites in the class. Every other count reads through the unsigned readShort() helper and cannot go negative, these four annotation counts were the only signed ones. Guarded all four with the UNRECOGNIZED_INDEX_ENTRY check already used by stringForCode and readFrom. Valid files parse unchanged.