Skip to content

upb: validate wire type before promoting an unknown field to a message extension #28144

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kuranikaran wants to merge 1 commit into
base: main
Choose a base branch
from
+29 −1
Open

upb: validate wire type before promoting an unknown field to a message extension #28144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion upb/message/promote.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,8 @@ upb_GetExtension_Status upb_Message_GetOrPromoteExtension(
const char* unknown_begin = ptr;
ptr = upb_WireReader_ReadTag(ptr, &tag, &stream);
if (!ptr) return kUpb_GetExtension_ParseError;
if (field_number == upb_WireReader_GetFieldNumber(tag)) {
if (field_number == upb_WireReader_GetFieldNumber(tag) &&
upb_WireReader_GetWireType(tag) == kUpb_WireType_Delimited) {
upb_StringView data;
found_count++;
upb_EpsCopyCapture capture;
Expand Down
27 changes: 27 additions & 0 deletions upb/message/promote_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,33 @@ TEST(GeneratedCode, PromoteFromMultiple) {
upb_Arena_Free(arena);
}

TEST(GeneratedCode, PromoteIgnoresWrongWireType) {
upb_Arena* arena = upb_Arena_New();
std::string serialized;
uint32_t tag =
upb_MiniTableExtension_Number(upb_test_ModelExtension1_model_ext_ext)
<< 3;
while (tag > 0x7f) {
serialized.push_back(static_cast<char>((tag & 0x7f) | 0x80));
tag >>= 7;
}
serialized.push_back(static_cast<char>(tag));
serialized.push_back(1);

upb_test_EmptyMessageWithExtensions* base_msg =
upb_test_EmptyMessageWithExtensions_parse(serialized.data(),
serialized.size(), arena);
ASSERT_NE(base_msg, nullptr);

upb_MessageValue value;
upb_GetExtension_Status status = upb_Message_GetOrPromoteExtension(
UPB_UPCAST(base_msg), upb_test_ModelExtension1_model_ext_ext, 0, arena,
&value);
EXPECT_EQ(kUpb_GetExtension_NotPresent, status);

upb_Arena_Free(arena);
}

TEST(GeneratedCode, Extensions) {
upb_Arena* arena = upb_Arena_New();
upb_test_ModelWithExtensions* msg = upb_test_ModelWithExtensions_new(arena);
Expand Down
Loading