[codex] Guard upb extension promotion by wire type#28144
Draft
kuranikaran wants to merge 1 commit into
Draft
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
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.
Summary
Guard lazy message-extension promotion so a same-number unknown field is only promoted when its stored wire type is length-delimited. This keeps non-delimited unknowns on the existing skip path instead of capturing them and re-decoding them as embedded messages.
Root cause
upb_Message_GetOrPromoteExtension() matched unknown fields by field number only before calling upb_MiniTable_ParseUnknownMessage(). A same-number unknown with a varint or fixed wire type could be interpreted as a length-delimited message payload, causing the varint value bytes to be consumed as a message length.
Tests
Follow-up
The legacy PromoteUnknownToMessage, PromoteUnknownToMessageArray, and PromoteUnknownToMap paths can reach the same parse helper via FindUnknown; they can receive the same wire-type guard in a follow-up.