Fix out-of-bounds token read on trailing address delimiters#60
Open
iliaal wants to merge 1 commit into
Open
Conversation
When the delimiter-skip loop in parse_address_tokens() advances start_tok
to exactly toks->ntokens (an address followed by one or more trailing ','
or ';'), the addr-spec branch read toks->tokens[start_tok].token with
start_tok == ntokens, one element past the ecalloc'd token array.
mailparse_rfc822_parse_addresses("a@b,,") triggers it.
Only strip the enclosing <> when the address span is non-empty
(a_count > 0), which also guarantees a_start < ntokens. The route-addr
branch is already guarded by its i < ntokens entry condition.
Change applied to both the .re source and the generated .c.
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.
In parse_address_tokens(), a run of trailing ',' or ';' delimiters can advance start_tok to toks->ntokens. The addr-spec branch then reads toks->tokens[start_tok].token with start_tok equal to ntokens, one element past the ecalloc'd token array. This strips the enclosing <> only when the address span is non-empty (a_count > 0), which also keeps the index in bounds; the route-addr branch is already guarded by its own i < ntokens check. Applied to both the .re source and the generated .c.
Reproducer: mailparse_rfc822_parse_addresses("a@b,,").