fix out-of-bounds read in DecodeNormLookup::decode#686
Open
arshsmith1 wants to merge 1 commit into
Open
Conversation
kevina
approved these changes
Jul 6, 2026
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.
In common/convert.cpp, DecodeNormLookup::decode walks the normalization output with the guard
ret.to[i] && i < E::max_to, so it dereferences ret.to[i] before the index is bounds-checked. When a decoded entry fills all three output slots with non-zero values, i reaches max_to and the loop reads ret.to[max_to], one Uni16 past the end of the max_to-sized to[] array (ToUniNormEntry::to is Uni16 to[3]). This path is reached when normalization is enabled and a to_uni norm form is selected, decoding untrusted input text.Reorder the two conditions so the bounds test short-circuits first, matching the three sibling loops in EncodeNormLookup a few lines down that already read as
i < E::max_to && ret.to[i]. Keeping the check on the same side as its siblings is the least surprising place for it.